s390/syscalls: move __S390_SYS_STUBx() macro

Move __S390_SYS_STUBx() the end of the CONFIG_COMPAT section, so both
variants (compat and non-compat) are close together and can be easily
compared.

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

diff --git a/arch/s390/include/asm/syscall_wrapper.h b/arch/s390/include/asm/syscall_wrapper.h
index de719f18a5486122cce758e192014e92f7a5c424..64e2dd1030806873197396533cd04abc0d903d8a 100644 (file)
--- a/arch/s390/include/asm/syscall_wrapper.h
+++ b/arch/s390/include/asm/syscall_wrapper.h
@@ -54,17 +54,6 @@
        (t)__ReS;                                                       \
 })
 
-#define __S390_SYS_STUBx(x, name, ...)                                         \
-       long __s390_sys##name(struct pt_regs *regs);                            \
-       ALLOW_ERROR_INJECTION(__s390_sys##name, ERRNO);                         \
-       long __s390_sys##name(struct pt_regs *regs)                             \
-       {                                                                       \
-               long ret = __do_sys##name(SYSCALL_PT_ARGS(x, regs,              \
-                       __SC_COMPAT_CAST, __MAP(x, __SC_TYPE, __VA_ARGS__)));   \
-               __MAP(x,__SC_TEST,__VA_ARGS__);                                 \
-               return ret;                                                     \
-       }
-
 /*
  * To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias
  * named __s390x_sys_*()
@@ -121,9 +110,18 @@
 #define COMPAT_SYS_NI(name)                                            \
        SYSCALL_ALIAS(__s390_compat_sys_##name, sys_ni_posix_timers)
 
-#else /* CONFIG_COMPAT */
+#define __S390_SYS_STUBx(x, name, ...)                                         \
+       long __s390_sys##name(struct pt_regs *regs);                            \
+       ALLOW_ERROR_INJECTION(__s390_sys##name, ERRNO);                         \
+       long __s390_sys##name(struct pt_regs *regs)                             \
+       {                                                                       \
+               long ret = __do_sys##name(SYSCALL_PT_ARGS(x, regs,              \
+                       __SC_COMPAT_CAST, __MAP(x, __SC_TYPE, __VA_ARGS__)));   \
+               __MAP(x,__SC_TEST,__VA_ARGS__);                                 \
+               return ret;                                                     \
+       }
 
-#define __S390_SYS_STUBx(x, fullname, name, ...)
+#else /* CONFIG_COMPAT */
 
 #define SYSCALL_DEFINE0(sname)                                         \
        SYSCALL_METADATA(_##sname, 0);                                  \
@@ -137,6 +135,8 @@
 #define SYS_NI(name)                                                   \
        SYSCALL_ALIAS(__s390x_sys_##name, sys_ni_posix_timers);
 
+#define __S390_SYS_STUBx(x, fullname, name, ...)
+
 #endif /* CONFIG_COMPAT */
 
 #define __SYSCALL_DEFINEx(x, name, ...)                                                        \