From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Nov 2011 03:26:25 +0000 (+1100)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20111129~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=573e48ab13a0e70430c8ed53a836a62602152651;p=karo-tx-linux.git

Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	arch/hexagon/Kconfig
	arch/m68k/Kconfig
---

573e48ab13a0e70430c8ed53a836a62602152651
diff --cc arch/hexagon/Kconfig
index a35ec474d0c1,9059e3905887..acdc187a5410
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -24,7 -26,8 +24,8 @@@ config HEXAGO
  	select HAVE_ARCH_KGDB
  	select HAVE_ARCH_TRACEHOOK
  	select NO_IOPORT
 +	select STACKTRACE_SUPPORT
+ 	select GENERIC_IOMAP
 -	# mostly generic routines, with some accelerated ones
  	---help---
  	  Qualcomm Hexagon is a processor architecture designed for high
  	  performance and low power across a wide variety of applications.
@@@ -71,9 -74,15 +72,6 @@@ config GENERIC_CSU
  config GENERIC_IRQ_PROBE
  	def_bool y
  
- config GENERIC_IOMAP
- 	def_bool y
 -#config ZONE_DMA
 -#	bool
 -#	default y
 -
 -config HAS_DMA
 -	bool
 -	select HAVE_DMA_ATTRS
 -	default y
--
  config NEED_SG_DMA_LENGTH
  	def_bool y
  
diff --cc arch/m68k/Kconfig
index 32fd3642e71b,973e68614f28..853570ea162c
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -37,12 -38,6 +37,9 @@@ config GENERIC_CALIBRATE_DELA
  	bool
  	default y
  
- config GENERIC_IOMAP
- 	def_bool MMU
- 
 +config GENERIC_CSUM
 +	bool
 +
  config TIME_LOW_RES
  	bool
  	default y
diff --cc arch/x86/Kconfig
index 1b531492a78a,08af6457de72..1fc48966efe2
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -75,9 -75,10 +75,10 @@@ config X8
  	select HAVE_BPF_JIT if (X86_64 && NET)
  	select CLKEVT_I8253
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
+ 	select GENERIC_IOMAP
  
  config INSTRUCTION_DECODER
 -	def_bool (KPROBES || PERF_EVENTS)
 +	def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
  	string