Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c76fc982 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Ingo Molnar
Browse files

syscalls/x86: Adapt syscall_wrapper.h to the new syscall stub naming convention 



Make the code in syscall_wrapper.h more readable by naming the stub macros
similar to the stub they provide. While at it, fix a stray newline at the
end of the __IA32_COMPAT_SYS_STUBx macro.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180409105145.5364-5-linux@dominikbrodowski.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d5a00528

arch/x86/include/asm/syscall_wrapper.h

+9 −9
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 * kernel/sys_ni.c and SYS_NI in kernel/time/posix-stubs.c to cover this

 * case as well.

 */

#define COMPAT_SC_IA32_STUBx(x, name, ...)				\

#define __IA32_COMPAT_SYS_STUBx(x, name, ...)				\

	asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs);\

	ALLOW_ERROR_INJECTION(__ia32_compat_sys##name, ERRNO);		\

	asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs)\
@@ -36,7 +36,7 @@ 
		return __se_compat_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\

	}								\



#define SC_IA32_WRAPPERx(x, name, ...)					\

#define __IA32_SYS_STUBx(x, name, ...)					\

	asmlinkage long __ia32_sys##name(const struct pt_regs *regs);	\

	ALLOW_ERROR_INJECTION(__ia32_sys##name, ERRNO);			\

	asmlinkage long __ia32_sys##name(const struct pt_regs *regs)	\
@@ -64,8 +64,8 @@ 
	SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers)



#else /* CONFIG_IA32_EMULATION */

#define COMPAT_SC_IA32_STUBx(x, name, ...)

#define SC_IA32_WRAPPERx(x, fullname, name, ...)

#define __IA32_COMPAT_SYS_STUBx(x, name, ...)

#define __IA32_SYS_STUBx(x, fullname, name, ...)

#endif /* CONFIG_IA32_EMULATION */
@@ -75,7 +75,7 @@ 
 * of the x86-64-style parameter ordering of x32 syscalls. The syscalls common

 * with x86_64 obviously do not need such care.

 */

#define COMPAT_SC_X32_STUBx(x, name, ...)				\

#define __X32_COMPAT_SYS_STUBx(x, name, ...)				\

	asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs);\

	ALLOW_ERROR_INJECTION(__x32_compat_sys##name, ERRNO);		\

	asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs)\
@@ -84,7 +84,7 @@ 
	}								\



#else /* CONFIG_X86_X32 */

#define COMPAT_SC_X32_STUBx(x, name, ...)

#define __X32_COMPAT_SYS_STUBx(x, name, ...)

#endif /* CONFIG_X86_X32 */
@@ -97,8 +97,8 @@ 
#define COMPAT_SYSCALL_DEFINEx(x, name, ...)					\

	static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\

	static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\

	COMPAT_SC_IA32_STUBx(x, name, __VA_ARGS__)				\

	COMPAT_SC_X32_STUBx(x, name, __VA_ARGS__)				\

	__IA32_COMPAT_SYS_STUBx(x, name, __VA_ARGS__)				\

	__X32_COMPAT_SYS_STUBx(x, name, __VA_ARGS__)				\

	static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\

	{									\

		return __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\
@@ -163,7 +163,7 @@ 
	{								\

		return __se_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\

	}								\

	SC_IA32_WRAPPERx(x, name, __VA_ARGS__)				\

	__IA32_SYS_STUBx(x, name, __VA_ARGS__)				\

	static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\

	{								\

		long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));\