[PATCH v2 4/8] x86, syscalls: Refactor SYS_NI macros

[Brian Gerst <brgerst@gmail.com>]

Pull the common code out from the SYS_NI macros into a new __SYS_NI macro.
Also conditionalize the X64 version in preparation for enabling syscall
wrappers on 32-bit native kernels.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
 arch/x86/include/asm/syscall_wrapper.h | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/syscall_wrapper.h b/arch/x86/include/asm/syscall_wrapper.h
index 781adf7f611f..1166635cd841 100644
--- a/arch/x86/include/asm/syscall_wrapper.h
+++ b/arch/x86/include/asm/syscall_wrapper.h
@@ -42,6 +42,9 @@ struct pt_regs;
 		return sys_ni_syscall();				\
 	}
 
+#define __SYS_NI(abi, name)						\
+	SYSCALL_ALIAS(__##abi##_##name, sys_ni_posix_timers)
+
 #ifdef CONFIG_X86_64
 #define __X64_SYS_STUB0(sys_name)					\
 	__SYS_STUB0(x64, sys_name)
@@ -52,10 +55,14 @@ struct pt_regs;
 
 #define __X64_COND_SYSCALL(sys_name)					\
 	__COND_SYSCALL(x64, sys_name)
+
+#define __X64_SYS_NI(sys_name)						\
+	__SYS_NI(x64, sys_name)
 #else /* CONFIG_X86_64 */
 #define __X64_SYS_STUB0(sys_name)
 #define __X64_SYS_STUBx(x, sys_name, ...)
 #define __X64_COND_SYSCALL(sys_name)
+#define __X64_SYS_NI(sys_name)
 #endif /* CONFIG_X86_64 */
 
 #ifdef CONFIG_IA32_EMULATION
@@ -77,6 +84,9 @@ struct pt_regs;
 #define __IA32_COMPAT_COND_SYSCALL(compat_sys_name)			\
 	__COND_SYSCALL(ia32, compat_sys_name)
 
+#define __IA32_COMPAT_SYS_NI(compat_sys_name)				\
+	__SYS_NI(ia32, compat_sys_name)
+
 #define __IA32_SYS_STUB0(sys_name)					\
 	__SYS_STUB0(ia32, sys_name)
 
@@ -87,17 +97,17 @@ struct pt_regs;
 #define __IA32_COND_SYSCALL(sys_name)					\
 	__COND_SYSCALL(ia32, sys_name)
 
-#define SYS_NI(name)							\
-	SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers);		\
-	SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers)
-
+#define __IA32_SYS_NI(sys_name)						\
+	__SYS_NI(ia32, sys_name)
 #else /* CONFIG_IA32_EMULATION */
 #define __IA32_COMPAT_SYS_STUB0(compat_sys_name)
 #define __IA32_COMPAT_SYS_STUBx(x, compat_sys_name, ...)
 #define __IA32_COMPAT_COND_SYSCALL(compat_sys_name)
+#define __IA32_COMPAT_SYS_NI(compat_sys_name)
 #define __IA32_SYS_STUB0(sys_name)
 #define __IA32_SYS_STUBx(x, sys_name, ...)
 #define __IA32_COND_SYSCALL(sys_name)
+#define __IA32_SYS_NI(sys_name)
 #endif /* CONFIG_IA32_EMULATION */
 
 
@@ -116,10 +126,14 @@ struct pt_regs;
 
 #define __X32_COMPAT_COND_SYSCALL(compat_sys_name)			\
 	__COND_SYSCALL(x32, compat_sys_name)
+
+#define __X32_COMPAT_SYS_NI(compat_sys_name)				\
+	__SYS_NI(x32, compat_sys_name)
 #else /* CONFIG_X86_X32 */
 #define __X32_COMPAT_SYS_STUB0(compat_sys_name)
 #define __X32_COMPAT_SYS_STUBx(x, compat_sys_name, ...)
 #define __X32_COMPAT_COND_SYSCALL(compat_sys_name)
+#define __X32_COMPAT_SYS_NI(compat_sys_name)
 #endif /* CONFIG_X86_X32 */
 
 
@@ -163,8 +177,8 @@ struct pt_regs;
 	__X32_COMPAT_COND_SYSCALL(compat_sys_##name)
 
 #define COMPAT_SYS_NI(name)						\
-	SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers);	\
-	SYSCALL_ALIAS(__x32_compat_sys_##name, sys_ni_posix_timers)
+	__IA32_COMPAT_SYS_NI(compat_sys_##name)				\
+	__X32_COMPAT_SYS_NI(compat_sys_##name)
 
 #endif /* CONFIG_COMPAT */
 
@@ -236,9 +250,9 @@ struct pt_regs;
 	__X64_COND_SYSCALL(sys_##name)					\
 	__IA32_COND_SYSCALL(sys_##name)
 
-#ifndef SYS_NI
-#define SYS_NI(name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers);
-#endif
+#define SYS_NI(name)							\
+	__X64_SYS_NI(sys_##name)					\
+	__IA32_SYS_NI(sys_##name)
 
 
 /*
-- 
2.24.1