summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2009-11-25Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: arch/arm/plat-mxc/Makefile
2009-11-25Merge branch 'quilt/tty'Stephen Rothwell
2009-11-25Merge remote branch 'sysctl/master'Stephen Rothwell
Conflicts: net/ipv6/addrconf.c
2009-11-25Merge remote branch 'workqueues/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/powerpc/platforms/pseries/hvCall.S arch/x86/kvm/svm.c kernel/softlockup.c
2009-11-25Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/kgdb.c kernel/irq/chip.c scripts/recordmcount.pl
2009-11-25Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'spi/next-spi'Stephen Rothwell
2009-11-25Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2009-11-25Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2009-11-25Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2009-11-25Merge remote branch 'fsnotify/for-next'Stephen Rothwell
Conflicts: arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S fs/afs/write.c fs/cifs/dir.c fs/ubifs/file.c include/asm-generic/fcntl.h net/socket.c
2009-11-25Merge remote branch 'trivial/for-next'Stephen Rothwell
Conflicts: arch/arm/plat-mxc/include/mach/mx2x.h drivers/net/e1000e/lib.c fs/ext4/balloc.c
2009-11-25Merge remote branch 'mfd/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2009-11-25Merge remote branch 'battery/master'Stephen Rothwell
2009-11-25Merge remote branch 'input/next'Stephen Rothwell
2009-11-25Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/arm/kernel/vmlinux.lds.S
2009-11-25Merge remote branch 'cpufreq/next'Stephen Rothwell
2009-11-25Merge remote branch 'sound/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'crypto/master'Stephen Rothwell
2009-11-25Merge remote branch 'mtd/master'Stephen Rothwell
2009-11-25Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/ieee802154/fakehard.c drivers/net/e1000e/ich8lan.c drivers/net/e1000e/phy.c drivers/net/netxen/netxen_nic_init.c drivers/net/wireless/ath/ath9k/main.c
2009-11-25Merge remote branch 'async_tx/next'Stephen Rothwell
2009-11-25Merge remote branch 'kvm/linux-next'Stephen Rothwell
2009-11-25Merge remote branch 'kbuild/master'Stephen Rothwell
2009-11-25Merge branch 'quilt/i2c'Stephen Rothwell
2009-11-25Merge remote branch 'pci/linux-next'Stephen Rothwell
2009-11-25Merge remote branch 'ext3/for_next'Stephen Rothwell
Conflicts: fs/cifs/dir.c
2009-11-25Merge remote branch 'sparc/master'Stephen Rothwell
2009-11-25Merge remote branch 'sh/master'Stephen Rothwell
2009-11-25Merge remote branch 's390/features'Stephen Rothwell
2009-11-25Merge remote branch '52xx-and-virtex/next'Stephen Rothwell
2009-11-25Merge remote branch 'powerpc/next'Stephen Rothwell
2009-11-25Merge remote branch 'parisc/next'Stephen Rothwell
2009-11-25Merge remote branch 'mips/mips-for-linux-next'Stephen Rothwell
Conflicts: arch/mips/Kconfig arch/mips/Makefile arch/mips/include/asm/ftrace.h arch/mips/kernel/ftrace.c arch/mips/kernel/mcount.S drivers/net/au1000_eth.c scripts/recordmcount.pl
2009-11-25Merge remote branch 'microblaze/next'Stephen Rothwell
2009-11-25Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'cris/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'avr32/avr32-arch'Stephen Rothwell
Conflicts: arch/avr32/mach-at32ap/include/mach/cpu.h
2009-11-25Merge remote branch 'samsung/next-samsung'Stephen Rothwell
2009-11-25Merge remote branch 'pxa/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'omap/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'msm/for-next'Stephen Rothwell
2009-11-25Merge remote branch 'davinci/davinci-next'Stephen Rothwell
2009-11-25Merge remote branch 'arm/devel'Stephen Rothwell
2009-11-25Merge remote branch 'cpufreq-current/fixes'Stephen Rothwell
2009-11-25module: make MODULE_SYMBOL_PREFIX into a CONFIG optionAlan Jenkins
The next commit will require the use of MODULE_SYMBOL_PREFIX in .tmp_exports-asm.S. Currently it is mixed in with C structure definitions in "asm/module.h". Move the definition of this arch option into Kconfig, so it can be easily accessed by any code. This also lets modpost.c use the same definition. Previously modpost relied on a hardcoded list of architectures in mk_elfconfig.c. A build test for blackfin, one of the two MODULE_SYMBOL_PREFIX archs, showed the generated code was unchanged. vmlinux was identical save for build ids, and an apparently randomized suffix on a single "__key" symbol in the kallsyms data). Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Acked-by: Mike Frysinger <vapier@gentoo.org> (blackfin) CC: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2009-11-25x86:dont-export-inlineRusty Russell
For CONFIG_PARAVIRT, load_gs_index is an inline function (it's #defined to native_load_gs_index otherwise). Exporting an inline function breaks the new assembler-based alphabetical sorted symbol list: Today's linux-next build (x86_64 allmodconfig) failed like this: .tmp_exports-asm.o: In function `__ksymtab_load_gs_index': (__ksymtab_sorted+0x5b40): undefined reference to `load_gs_index' Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> To: x86@kernel.org Cc: alan-jenkins@tuffmail.co.uk
2009-11-25ARM: unexport symbols used to implement floating point emulationAlan Jenkins
The Kconfigs for in-tree floating point emulation do not allow building as modules. That leaves the Acorn FPEmulator module. I found two public releases of this as a binary module for 2.1 and 2.2 kernels, optimized for ARMV4.[1] If there is a resurgence of interest in this, the symbols can always be re-exported. This allows the EXPORT_SYMBOL_ALIAS() hack to be removed. The ulterior motive here is that EXPORT_SYMBOL_ALIAS() makes it harder to sort the resulting kernel symbol tables. Sorted symbol tables will allow faster symbol resolution during module loading. Note that fp_send_sigs() and fp_printk() are simply aliases for existing exports and add no obvious value. Similarly fp_enter could easily be renamed to kern_fp_enter at the point of definition. Therefore removing EXPORT_SYMBOL_ALIAS will not serve as a material obstacle to re-adding the exports should they be desired in future. Build tested only. [1] http://ftp.arm.linux.org.uk/pub/linux/arm/fpemulator/ Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> CC: Russell King <linux@arm.linux.org.uk> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>