diff options
author | Christoph Hellwig <hch@lst.de> | 2008-05-01 12:43:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 13:21:54 -0400 |
commit | bcf35afb528109a31264b45d4851fa6ae72dbe18 (patch) | |
tree | 37607aae9efdbd1005d82e0a9a679899eb5a3afe /kernel/ptrace.c | |
parent | 9fc3ace937a675bf42cbe6e6ef8950a6731ca16f (diff) |
make generic sys_ptrace unconditional
With s390 the last arch switched to the generic sys_ptrace yesterday so
we can now kill the ifdef around it to enforce every new port it using
it instead of introducing new weirdo versions.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r-- | kernel/ptrace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index dcc199c43a12..6c19e94fd0a5 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
@@ -534,7 +534,6 @@ struct task_struct *ptrace_get_task_struct(pid_t pid) | |||
534 | #define arch_ptrace_attach(child) do { } while (0) | 534 | #define arch_ptrace_attach(child) do { } while (0) |
535 | #endif | 535 | #endif |
536 | 536 | ||
537 | #ifndef __ARCH_SYS_PTRACE | ||
538 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) | 537 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) |
539 | { | 538 | { |
540 | struct task_struct *child; | 539 | struct task_struct *child; |
@@ -582,7 +581,6 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data) | |||
582 | unlock_kernel(); | 581 | unlock_kernel(); |
583 | return ret; | 582 | return ret; |
584 | } | 583 | } |
585 | #endif /* __ARCH_SYS_PTRACE */ | ||
586 | 584 | ||
587 | int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data) | 585 | int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data) |
588 | { | 586 | { |