With the special case handling for Blackfin and Metag was removed by
commit 94e58e0ac312 ("export.h: remove code for prefixing symbols with
underscore"), VMLINUX_SYMBOL_STR() is now equivalent to __stringify().

Replace some remaining usages in <linux/linkage.h> to prepare for the
entire removal of VMLINUX_SYMBOL_STR().

Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com>
---

 include/linux/linkage.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index f68db9e..d7618c4 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -24,16 +24,16 @@
 
 #ifndef cond_syscall
 #define cond_syscall(x)        asm(                            \
-       ".weak " VMLINUX_SYMBOL_STR(x) "\n\t"           \
-       ".set  " VMLINUX_SYMBOL_STR(x) ","              \
-                VMLINUX_SYMBOL_STR(sys_ni_syscall))
+       ".weak " __stringify(x) "\n\t"                  \
+       ".set  " __stringify(x) ","                     \
+                __stringify(sys_ni_syscall))
 #endif
 
 #ifndef SYSCALL_ALIAS
 #define SYSCALL_ALIAS(alias, name) asm(                        \
-       ".globl " VMLINUX_SYMBOL_STR(alias) "\n\t"      \
-       ".set   " VMLINUX_SYMBOL_STR(alias) ","         \
-                 VMLINUX_SYMBOL_STR(name))
+       ".globl " __stringify(alias) "\n\t"             \
+       ".set   " __stringify(alias) ","                \
+                 __stringify(name))
 #endif
 
 #define __page_aligned_data    __section(.data..page_aligned) 
__aligned(PAGE_SIZE)
-- 
2.7.4

Reply via email to