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

Commit 83460ec8 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

syscalls.h: use gcc alias instead of assembler aliases for syscalls 



Use standard gcc __attribute__((alias(foo))) to define the syscall aliases
instead of custom assembler macros.

This is far cleaner, and also fixes my LTO kernel build.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54886a71

include/linux/compat.h

+2 −2
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ 
	COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)



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

	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\

	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\

		__attribute__((alias(__stringify(compat_SyS##name))));  \

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

	asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\

	asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\

	{								\

		return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));	\

	}								\

	SYSCALL_ALIAS(compat_sys##name, compat_SyS##name);		\

	static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))



#ifndef compat_user_stack_pointer

include/linux/syscalls.h

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs; 


#define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)

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

	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\

	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\

		__attribute__((alias(__stringify(SyS##name))));		\

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

	asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\

	asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\
@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
		__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));	\

		return ret;						\

	}								\

	SYSCALL_ALIAS(sys##name, SyS##name);				\

	static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))



asmlinkage long sys_time(time_t __user *tloc);