Skip to content

Commit

Permalink
[PATCH] x86_64: Remove __KERNEL__ ifdef around _syscall*()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Aug 30, 2006
1 parent 40dd2d2 commit bbad0b6
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions include/asm-x86_64/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,6 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice)
#define __NR_move_pages 279
__SYSCALL(__NR_move_pages, sys_move_pages)

#ifdef __KERNEL__

#define __NR_syscall_max __NR_move_pages

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

#else /* __KERNEL_SYSCALLS__ */

#ifdef __KERNEL__

#include <linux/syscalls.h>
#include <asm/ptrace.h>

Expand Down Expand Up @@ -838,9 +838,9 @@ asmlinkage long sys_rt_sigaction(int sig,
struct sigaction __user *oact,
size_t sigsetsize);

#endif /* __ASSEMBLY__ */
#endif

#endif /* __NO_STUBS */
#endif

/*
* "Conditional" syscalls
Expand All @@ -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")

#endif /* __KERNEL__ */
#endif

#endif

0 comments on commit bbad0b6

Please sign in to comment.