diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /kernel/ptrace.c | |
| parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 29dc700e198c..c9cf48b21f05 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -574,7 +574,7 @@ struct task_struct *ptrace_get_task_struct(pid_t pid) #define arch_ptrace_attach(child) do { } while (0) #endif -asmlinkage long sys_ptrace(long request, long pid, long addr, long data) +SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data) { struct task_struct *child; long ret; |