Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33705
b: refs/heads/master
c: bbad0b6
h: refs/heads/master
i:
  33703: 163b978
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Aug 30, 2006
1 parent 7d8e145 commit feea2e6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40dd2d20f220eda1cd0da8ea3f0f9db8971ba237
refs/heads/master: bbad0b669d33f3023cfe70ec79ba5ea487afca59
11 changes: 6 additions & 5 deletions trunk/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 feea2e6

Please sign in to comment.