From: Stephen Rothwell Date: Mon, 8 Oct 2012 00:48:40 +0000 (+1100) Subject: Merge remote-tracking branch 'modules/modules-next' X-Git-Tag: next-20121008~41 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5e393cb307e24b67d8c400c24e098ef2c696f8d5;p=karo-tx-linux.git Merge remote-tracking branch 'modules/modules-next' Conflicts: Makefile arch/Kconfig arch/cris/include/asm/Kbuild arch/h8300/include/asm/Kbuild arch/m32r/include/asm/Kbuild arch/x86/Kconfig arch/x86/um/Kconfig arch/xtensa/Kconfig init/Kconfig --- 5e393cb307e24b67d8c400c24e098ef2c696f8d5 diff --cc Makefile index 5d8e7f258388,e70ebfee9c80..2d3daf7c1211 --- a/Makefile +++ b/Makefile @@@ -996,8 -993,12 +996,11 @@@ CLEAN_DIRS += $(MODVERDIR # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated -MRPROPER_FILES += .config .config.old .version .old_version \ - include/linux/version.h \ +MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS + Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ + signing_key.priv signing_key.x509 x509.genkey \ + extra_certificates signing_key.x509.keyid \ + signing_key.x509.signer # clean - Delete most, but leave enough to build external modules # 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/cris/include/asm/Kbuild index a8eab26a1ec7,28b690de7971..6900bbf903c5 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@@ -8,4 -8,4 +8,5 @@@ header-y += etraxgpio. header-y += rs485.h header-y += sync_serial.h + generic-y += module.h +generic-y += clkdev.h diff --cc arch/h8300/include/asm/Kbuild index 0e152a93c125,871382d239fe..98477e928788 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild @@@ -1,3 -1,3 +1,4 @@@ include include/asm-generic/Kbuild.asm + generic-y += module.h +generic-y += clkdev.h diff --cc arch/m32r/include/asm/Kbuild index 0e152a93c125,871382d239fe..98477e928788 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@@ -1,3 -1,3 +1,4 @@@ include include/asm-generic/Kbuild.asm + generic-y += module.h +generic-y += clkdev.h diff --cc arch/x86/Kconfig index b72777ff32a9,01726cbcc73b..76936ce3bb01 --- 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 diff --cc init/Kconfig index ed6334dd5e71,abc6e63f2fb8..1fd5680df2c8 --- a/init/Kconfig +++ b/init/Kconfig @@@ -1582,10 -1672,12 +1642,18 @@@ config PADAT depends on SMP bool +# Can be selected by architectures with broken toolchains +# that get confused by correct const<->read_only section +# mappings +config BROKEN_RODATA + bool + + config ASN1 + tristate + help + Build a simple ASN.1 grammar compiler that produces a bytecode output + that can be interpreted by the ASN.1 stream decoder and used to + inform it as to what tags are to be expected in a stream and what + functions to call on what tags. + source "kernel/Kconfig.locks" diff --cc security/keys/trusted.c index 3f163d0489ad,42036c7a0856..e13fcf7636f7 --- a/security/keys/trusted.c +++ b/security/keys/trusted.c @@@ -903,9 -936,8 +904,9 @@@ static int trusted_instantiate(struct k char *datablob; int ret = 0; int key_cmd; + size_t key_len; - if (datalen <= 0 || datalen > 32767 || !data) + if (datalen <= 0 || datalen > 32767 || !prep->data) return -EINVAL; datablob = kmalloc(datalen + 1, GFP_KERNEL);