From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 03:13:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'modules/modules-next'
X-Git-Tag: next-20121003~46
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fc9a3974607995284f99afeffa27866308a16ef;p=karo-tx-linux.git

Merge remote-tracking branch 'modules/modules-next'

Conflicts:
	arch/Kconfig
	arch/x86/Kconfig
	arch/x86/um/Kconfig
	arch/xtensa/Kconfig
---

2fc9a3974607995284f99afeffa27866308a16ef
diff --cc arch/Kconfig
index a62965d057f6,3450115c6437..8ee5ccf234e3
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -294,23 -281,23 +294,42 @@@ 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_RCU_USER_QS
 +	bool
 +	help
 +	  Provide kernel entry/exit hooks necessary for userspace
 +	  RCU extended quiescent state. Syscalls need to be wrapped inside
 +	  rcu_user_exit()-rcu_user_enter() through the slow path using
 +	  TIF_NOHZ flag. Exceptions handlers must be wrapped as well. Irqs
 +	  are already protected inside rcu_irq_enter/rcu_irq_exit() but
 +	  preemption or signal handling on irq exit still need to be protected.
 +
 +config HAVE_VIRT_CPU_ACCOUNTING
 +	bool
 +
 +config HAVE_IRQ_TIME_ACCOUNTING
 +	bool
 +	help
 +	  Archs need to ensure they use a high enough resolution clock to
 +	  support irq time accounting and then call enable_sched_clock_irqtime().
 +
  source "kernel/gcov/Kconfig"
diff --cc arch/x86/Kconfig
index 7f9a395c5254,01726cbcc73b..061b8eb2efa0
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -102,12 -97,11 +102,14 @@@ 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
 +	select HAVE_RCU_USER_QS if X86_64
 +	select HAVE_IRQ_TIME_ACCOUNTING
  
  config INSTRUCTION_DECODER
 -	def_bool (KPROBES || PERF_EVENTS || UPROBES)
 +	def_bool y
 +	depends on KPROBES || PERF_EVENTS || UPROBES
  
  config OUTPUT_FORMAT
  	string
diff --cc arch/x86/um/Kconfig
index aeaff8bef2f1,a4b0c10c9d5d..35f462a6512b
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config 64BI
  config X86_32
  	def_bool !64BIT
  	select HAVE_AOUT
 +	select ARCH_WANT_IPC_PARSE_VERSION
+ 	select MODULES_USE_ELF_REL
  
  config X86_64
  	def_bool 64BIT