From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 03:34:26 +0000 (+1000)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20120926~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b933c7d345288aeb74b8f170630cb184484ea89;p=karo-tx-linux.git

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/Kconfig
	arch/s390/Kconfig
---

9b933c7d345288aeb74b8f170630cb184484ea89
diff --cc arch/Kconfig
index 3450115c6437,ea5feb6c1003..07db9299ea86
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -281,23 -294,7 +294,26 @@@ config SECCOMP_FILTE
  
  	  See Documentation/prctl/seccomp_filter.txt for details.
  
 +config HAVE_MOD_ARCH_SPECIFIC
 +	bool
 +	help
 +	  The arch uses struct mod_arch_specific to store data.  Many arches
 +	  just need a simple module loader without arch specific data - those
 +	  should not enable this.
 +
 +config MODULES_USE_ELF_RELA
 +	bool
 +	help
 +	  Modules only use ELF RELA relocations.  Modules with ELF REL
 +	  relocations will give an error.
 +
 +config MODULES_USE_ELF_REL
 +	bool
 +	help
 +	  Modules only use ELF REL relocations.  Modules with ELF RELA
 +	  relocations will give an error.
 +
+ config HAVE_VIRT_CPU_ACCOUNTING
+ 	bool
+ 
  source "kernel/gcov/Kconfig"
diff --cc arch/s390/Kconfig
index 2fd291547ffb,f5ab543396da..a4843ddce69f
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -96,7 -86,8 +93,9 @@@ config S39
  	select HAVE_MEMBLOCK
  	select HAVE_MEMBLOCK_NODE_MAP
  	select HAVE_CMPXCHG_LOCAL
 +	select HAVE_CMPXCHG_DOUBLE
+ 	select HAVE_VIRT_CPU_ACCOUNTING
+ 	select VIRT_CPU_ACCOUNTING
  	select ARCH_DISCARD_MEMBLOCK
  	select BUILDTIME_EXTABLE_SORT
  	select ARCH_INLINE_SPIN_TRYLOCK
diff --cc arch/x86/Kconfig
index ede3e92c70a0,fc76528cb1c9..a0f5b51f5583
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -97,11 -102,10 +102,12 @@@ config X8
  	select KTIME_SCALAR if X86_32
  	select GENERIC_STRNCPY_FROM_USER
  	select GENERIC_STRNLEN_USER
 +	select MODULES_USE_ELF_REL if X86_32
 +	select MODULES_USE_ELF_RELA if X86_64
  
  config INSTRUCTION_DECODER
- 	def_bool (KPROBES || PERF_EVENTS || UPROBES)
+ 	def_bool y
+ 	depends on KPROBES || PERF_EVENTS || UPROBES
  
  config OUTPUT_FORMAT
  	string