From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Sep 2012 03:50:12 +0000 (+1000)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20120906~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7fceef9b8a27370f2cbb84339746b4643a5c3106;p=karo-tx-linux.git

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

Conflicts:
	arch/Kconfig
---

7fceef9b8a27370f2cbb84339746b4643a5c3106
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"