Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / linux / linkage.h

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index de09dec25ec3b99372bdc4df356380d7ccc4a939..d3e8ad23a8e0238645fe553f8183a2ad74bf5fc3 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -3,6 +3,7 @@
 
 #include <linux/compiler.h>
 #include <linux/stringify.h>
+#include <linux/export.h>
 #include <asm/linkage.h>
 
 #ifdef __cplusplus
@@ -15,21 +16,18 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
 
-#ifdef CONFIG_SYMBOL_PREFIX
-#define __SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX __stringify(x)
-#else
-#define __SYMBOL_NAME(x) __stringify(x)
-#endif
-
 #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 " VMLINUX_SYMBOL_STR(x) "\n\t"           \
+       ".set  " 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))
+#define SYSCALL_ALIAS(alias, name) asm(                        \
+       ".globl " VMLINUX_SYMBOL_STR(alias) "\n\t"      \
+       ".set   " VMLINUX_SYMBOL_STR(alias) ","         \
+                 VMLINUX_SYMBOL_STR(name))
 #endif
 
 #define __page_aligned_data    __section(.data..page_aligned) __aligned(PAGE_SIZE)