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

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

[PATCH] x86_64: Remove __KERNEL__ ifdef around _syscall*() 



After all their only point is having them in user space. On x86-64
they don't even work in kernel space.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40dd2d20

include/asm-x86_64/unistd.h

+6 −5
Original line number Original line Diff line number Diff line
@@ -620,8 +620,6 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice) 
#define __NR_move_pages		279

#define __NR_move_pages		279

__SYSCALL(__NR_move_pages, sys_move_pages)

__SYSCALL(__NR_move_pages, sys_move_pages)





#ifdef __KERNEL__



#define __NR_syscall_max __NR_move_pages

#define __NR_syscall_max __NR_move_pages





#ifndef __NO_STUBS

#ifndef __NO_STUBS
@@ -746,6 +744,8 @@ __syscall_return(type,__res); \ 




#else /* __KERNEL_SYSCALLS__ */

#else /* __KERNEL_SYSCALLS__ */





#ifdef __KERNEL__



#include <linux/syscalls.h>

#include <linux/syscalls.h>

#include <asm/ptrace.h>

#include <asm/ptrace.h>
@@ -838,9 +838,9 @@ asmlinkage long sys_rt_sigaction(int sig, 
				struct sigaction __user *oact,

				struct sigaction __user *oact,

				size_t sigsetsize);

				size_t sigsetsize);





#endif	/* __ASSEMBLY__ */

#endif





#endif /* __NO_STUBS */

#endif





/*

/*

 * "Conditional" syscalls

 * "Conditional" syscalls
@@ -850,5 +850,6 @@ asmlinkage long sys_rt_sigaction(int sig, 
 */

 */

#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")

#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")





#endif /* __KERNEL__ */

#endif



#endif
 
#endif