James Hogan 126de6b20b linkage.h: fix build breakage due to symbol prefix handling ... Al's commit e1b5bb6d12 ("consolidate cond_syscall and SYSCALL_ALIAS declarations") broke the build on blackfin and metag due to the following code: #ifndef SYMBOL_NAME #ifdef CONFIG_SYMBOL_PREFIX #define SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX ## x #else #define SYMBOL_NAME(x) x #endif #endif #define __SYMBOL_NAME(x) __stringify(SYMBOL_NAME(x)) __stringify literally stringifies CONFIG_SYMBOL_PREFIX ##x, so you get lines like this in kernel/sys_ni.s: .weak CONFIG_SYMBOL_PREFIXsys_quotactl .set CONFIG_SYMBOL_PREFIXsys_quotactl,CONFIG_SYMBOL_PREFIXsys_ni_syscall The patches in Rusty's modules-next tree such as "CONFIG_SYMBOL_PREFIX: cleanup." cleans up the whole mess around symbol prefixes, so this patch just attempts to fix the build in the meantime. The intermediate definition of SYMBOL_NAME above isn't used and is incorrect when CONFIG_SYMBOL_PREFIX is defined as CONFIG_SYMBOL_PREFIX is a quoted string literal, so define __SYMBOL_NAME directly depending on CONFIG_SYMBOL_PREFIX. Signed-off-by: James Hogan <james.hogan@imgtec.com> Mea-culpa-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Mike Frysinger <vapier@gentoo.org> Cc: uclinux-dist-devel@blackfin.uclinux.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2013-05-01 15:51:29 -07:00
..
acpi	Merge branch 'acpi-assorted'	2013-04-28 01:54:08 +02:00
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2013-05-01 07:21:43 -07:00
clocksource
crypto
drm
keys
linux	linkage.h: fix build breakage due to symbol prefix handling	2013-05-01 15:51:29 -07:00
math-emu
media	Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-05-01 09:57:04 -07:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'akpm' (incoming from Andrew)	2013-04-30 17:37:43 -07:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-04-30 09:36:50 -07:00
target	iscsi-target: Add iscsit_transport API template	2013-04-25 01:05:26 -07:00
trace	Mostly performance and bug fixes, plus some cleanups. The one new	2013-05-01 08:04:12 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
video	drivers/video/backlight/platform_lcd.c: introduce probe callback	2013-04-29 18:28:18 -07:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
Kbuild	UAPI: remove empty Kbuild files	2013-04-30 17:04:09 -07:00