s390: remove asmlinkage

On s390 asmlinkage is a nop, so remove it.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/preempt.h b/arch/s390/include/asm/preempt.h
index 6ede29907fbf76424ed52de165db93af0e600933..b49e0492842cccddde08d6497d673ed3022b52e3 100644 (file)
--- a/arch/s390/include/asm/preempt.h
+++ b/arch/s390/include/asm/preempt.h
@@ -131,9 +131,9 @@ static inline bool should_resched(int preempt_offset)
 #endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */
 
 #ifdef CONFIG_PREEMPTION
-extern asmlinkage void preempt_schedule(void);
+extern void preempt_schedule(void);
 #define __preempt_schedule() preempt_schedule()
-extern asmlinkage void preempt_schedule_notrace(void);
+extern void preempt_schedule_notrace(void);
 #define __preempt_schedule_notrace() preempt_schedule_notrace()
 #endif /* CONFIG_PREEMPTION */
 

diff --git a/arch/s390/include/asm/syscall_wrapper.h b/arch/s390/include/asm/syscall_wrapper.h
index 1320f4213d804e7aaa5f2aeface8b19334435f8e..5364bfc866e013245544a5c636b4b5145529dd0c 100644 (file)
--- a/arch/s390/include/asm/syscall_wrapper.h
+++ b/arch/s390/include/asm/syscall_wrapper.h
@@ -30,9 +30,9 @@
 })
 
 #define __S390_SYS_STUBx(x, name, ...)                                 \
-       asmlinkage long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
+       long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));          \
        ALLOW_ERROR_INJECTION(__s390_sys##name, ERRNO);                 \
-       asmlinkage long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
+       long __s390_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))           \
        {                                                               \
                long ret = __s390x_sys##name(__MAP(x,__SC_COMPAT_CAST,__VA_ARGS__));\
                __MAP(x,__SC_TEST,__VA_ARGS__);                         \
@@ -45,17 +45,17 @@
  */
 #define COMPAT_SYSCALL_DEFINE0(sname)                                  \
        SYSCALL_METADATA(_##sname, 0);                                  \
-       asmlinkage long __s390_compat_sys_##sname(void);                \
+       long __s390_compat_sys_##sname(void);                           \
        ALLOW_ERROR_INJECTION(__s390_compat_sys_##sname, ERRNO);        \
-       asmlinkage long __s390_compat_sys_##sname(void)
+       long __s390_compat_sys_##sname(void)
 
 #define SYSCALL_DEFINE0(sname)                                         \
        SYSCALL_METADATA(_##sname, 0);                                  \
-       asmlinkage long __s390x_sys_##sname(void);                      \
+       long __s390x_sys_##sname(void);                                 \
        ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO);              \
-       asmlinkage long __s390_sys_##sname(void)                        \
+       long __s390_sys_##sname(void)                                   \
                __attribute__((alias(__stringify(__s390x_sys_##sname)))); \
-       asmlinkage long __s390x_sys_##sname(void)
+       long __s390x_sys_##sname(void)
 
 #define COND_SYSCALL(name)                                             \
        cond_syscall(__s390x_sys_##name);                               \
@@ -69,13 +69,13 @@
        __diag_push();                                                          \
        __diag_ignore(GCC, 8, "-Wattribute-alias",                              \
                      "Type aliasing is used to sanitize syscall arguments");\
-       asmlinkage long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));        \
-       asmlinkage long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
+       long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));           \
+       long __s390_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))            \
                __attribute__((alias(__stringify(__se_compat_sys##name))));     \
        ALLOW_ERROR_INJECTION(__s390_compat_sys##name, ERRNO);                  \
        static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
-       asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));  \
-       asmlinkage long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))   \
+       long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));             \
+       long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))              \
        {                                                                       \
                long ret = __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\
                __MAP(x,__SC_TEST,__VA_ARGS__);                                 \
@@ -101,9 +101,9 @@
 
 #define SYSCALL_DEFINE0(sname)                                         \
        SYSCALL_METADATA(_##sname, 0);                                  \
-       asmlinkage long __s390x_sys_##sname(void);                      \
+       long __s390x_sys_##sname(void);                                 \
        ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO);              \
-       asmlinkage long __s390x_sys_##sname(void)
+       long __s390x_sys_##sname(void)
 
 #define COND_SYSCALL(name)                                             \
        cond_syscall(__s390x_sys_##name)
@@ -117,13 +117,13 @@
        __diag_push();                                                          \
        __diag_ignore(GCC, 8, "-Wattribute-alias",                              \
                      "Type aliasing is used to sanitize syscall arguments");\
-       asmlinkage long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))       \
+       long __s390x_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))                  \
                __attribute__((alias(__stringify(__se_sys##name))));            \
        ALLOW_ERROR_INJECTION(__s390x_sys##name, ERRNO);                        \
        long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));                    \
        static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));      \
        __S390_SYS_STUBx(x, name, __VA_ARGS__)                                  \
-       asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))          \
+       long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))                     \
        {                                                                       \
                long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));      \
                __MAP(x,__SC_TEST,__VA_ARGS__);                                 \