diff options
author | Roland McGrath <roland@redhat.com> | 2007-12-20 03:58:55 -0800 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-07 20:40:21 +1100 |
commit | 81e695c026eeda9a97e412fa4f458e5cab2f6c85 (patch) | |
tree | a81404f170a260a2718064938a5036972da27e93 /arch/powerpc | |
parent | 1d48d71c06172c0853e04c334456e64cc006e208 (diff) | |
download | op-kernel-dev-81e695c026eeda9a97e412fa4f458e5cab2f6c85.zip op-kernel-dev-81e695c026eeda9a97e412fa4f458e5cab2f6c85.tar.gz |
[POWERPC] Use generic compat_sys_ptrace
This replaces powerpc's compat_sys_ptrace with a compat_arch_ptrace and
enables the new generic definition of compat_sys_ptrace instead.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/ptrace32.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c index 6612304..0f6eea0 100644 --- a/arch/powerpc/kernel/ptrace32.c +++ b/arch/powerpc/kernel/ptrace32.c @@ -85,33 +85,13 @@ static long compat_ptrace_old(struct task_struct *child, long request, return ret; } -long compat_sys_ptrace(int request, int pid, unsigned long addr, - unsigned long data) +long compat_arch_ptrace(struct task_struct *child, compat_long_t request, + compat_ulong_t caddr, compat_ulong_t cdata) { - struct task_struct *child; + unsigned long addr = caddr; + unsigned long data = cdata; int ret; - lock_kernel(); - if (request == PTRACE_TRACEME) { - ret = ptrace_traceme(); - goto out; - } - - child = ptrace_get_task_struct(pid); - if (IS_ERR(child)) { - ret = PTR_ERR(child); - goto out; - } - - if (request == PTRACE_ATTACH) { - ret = ptrace_attach(child); - goto out_tsk; - } - - ret = ptrace_check_attach(child, request == PTRACE_KILL); - if (ret < 0) - goto out_tsk; - switch (request) { /* * Read 4 bytes of the other process' storage @@ -375,9 +355,6 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr, ret = compat_ptrace_request(child, request, addr, data); break; } -out_tsk: - put_task_struct(child); -out: - unlock_kernel(); + return ret; } |