Hi Al, Today's linux-next merge of the signal tree got a conflict in include/asm-generic/unistd.h between commit 837718bfd28b ("CONFIG_SYMBOL_PREFIX: cleanup") from the modules tree and commit e1b5bb6d1236 ("consolidate cond_syscall and SYSCALL_ALIAS declarations") from the signal tree. The latter moved the cond_syscall stuff to linkage.h, so I applied the following patch as a merge fixup and can carry the fix as necessary (no action is required). I am not sure if this is completely correct or all that is needed. From: Stephen Rothwell Date: Thu, 14 Mar 2013 17:14:41 +1100 Subject: [PATCH] cond_syscall and SYSCALL_ALIAS merge fixup Signed-off-by: Stephen Rothwell --- include/linux/linkage.h | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 829d66c..bedcddf 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -2,7 +2,7 @@ #define _LINUX_LINKAGE_H #include -#include +#include #include #ifdef __cplusplus @@ -15,24 +15,16 @@ #define asmlinkage CPP_ASMLINKAGE #endif -#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)) - #ifndef cond_syscall -#define cond_syscall(x) asm(".weak\t" __SYMBOL_NAME(x) \ - "\n\t.set\t" __SYMBOL_NAME(x) "," __SYMBOL_NAME(sys_ni_syscall)); +#define cond_syscall(x) asm(".weak\t" VMLINUX_SYMBOL_STR(x) "\n\t" \ + ".set\t" VMLINUX_SYMBOL_STR(x) "," \ + VMLINUX_SYMBOL_STR(sys_ni_syscall)) #endif #ifndef SYSCALL_ALIAS #define SYSCALL_ALIAS(alias, name) \ - asm ("\t.globl " __SYMBOL_NAME(alias) \ - "\n\t.set\t" __SYMBOL_NAME(alias) "," __SYMBOL_NAME(name)) + asm ("\t.globl " VMLINUX_SYMBOL_STR(alias) \ + "\n\t.set\t" VMLINUX_SYMBOL_STR(alias) "," VMLINUX_SYMBOL_STR(name)) #endif #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE) -- 1.8.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au