mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
[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: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
40dd2d20f2
commit
bbad0b669d
1 changed files with 6 additions and 5 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue