Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / arch / xtensa / kernel / ptrace.c

diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index 14460743de079dd32263a003b6d58d640f335027..5064d9383963282433ab4109fcc89eba2c6ccfad 100644 (file)
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -13,7 +13,6 @@
  * Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca>
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -45,58 +44,10 @@ void ptrace_disable(struct task_struct *child)
        /* Nothing to do.. */
 }
 
-long sys_ptrace(long request, long pid, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-       struct task_struct *child;
        int ret = -EPERM;
 
-       lock_kernel();
-
-#if 0
-       if ((int)request != 1)
-       printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
-              (int) request, (int) pid, (unsigned long) addr,
-              (unsigned long) data);
-#endif
-
-       if (request == PTRACE_TRACEME) {
-
-               /* Are we already being traced? */
-
-               if (current->ptrace & PT_PTRACED)
-                       goto out;
-
-               if ((ret = security_ptrace(current->parent, current)))
-                       goto out;
-
-               /* Set the ptrace bit in the process flags. */
-
-               current->ptrace |= PT_PTRACED;
-               ret = 0;
-               goto out;
-       }
-
-       ret = -ESRCH;
-       read_lock(&tasklist_lock);
-       child = find_task_by_pid(pid);
-       if (child)
-               get_task_struct(child);
-       read_unlock(&tasklist_lock);
-       if (!child)
-               goto out;
-
-       ret = -EPERM;
-       if (pid == 1)           /* you may not mess with init */
-               goto out;
-
-       if (request == PTRACE_ATTACH) {
-               ret = ptrace_attach(child);
-               goto out_tsk;
-       }
-
-       if ((ret = ptrace_check_attach(child, request == PTRACE_KILL)) < 0)
-               goto out_tsk;
-
        switch (request) {
        case PTRACE_PEEKTEXT: /* read word at location addr. */
        case PTRACE_PEEKDATA:
@@ -120,7 +71,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                struct pt_regs *regs;
                unsigned long tmp;
 
-               regs = xtensa_pt_regs(child);
+               regs = task_pt_regs(child);
                tmp = 0;  /* Default return value. */
 
                switch(addr) {
@@ -197,7 +148,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
        case PTRACE_POKEUSR:
                {
                struct pt_regs *regs;
-               regs = xtensa_pt_regs(child);
+               regs = task_pt_regs(child);
 
                switch (addr) {
                case REG_AR_BASE ... REG_AR_BASE + XCHAL_NUM_AREGS - 1:
@@ -288,7 +239,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                 * elf_gregset_t format. */
 
                xtensa_gregset_t format;
-               struct pt_regs *regs = xtensa_pt_regs(child);
+               struct pt_regs *regs = task_pt_regs(child);
 
                do_copy_regs (&format, regs, child);
 
@@ -305,7 +256,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                 * values in the elf_gregset_t format. */
 
                xtensa_gregset_t format;
-               struct pt_regs *regs = xtensa_pt_regs(child);
+               struct pt_regs *regs = task_pt_regs(child);
 
                if (copy_from_user(&format,(void *)data,sizeof(elf_gregset_t))){
                        ret = -EFAULT;
@@ -329,7 +280,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                 * elf_fpregset_t format. */
 
                elf_fpregset_t fpregs;
-               struct pt_regs *regs = xtensa_pt_regs(child);
+               struct pt_regs *regs = task_pt_regs(child);
 
                do_save_fpregs (&fpregs, regs, child);
 
@@ -347,7 +298,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                 * values in the elf_fpregset_t format.
                 */
                elf_fpregset_t fpregs;
-               struct pt_regs *regs = xtensa_pt_regs(child);
+               struct pt_regs *regs = task_pt_regs(child);
 
                ret = 0;
                if (copy_from_user(&fpregs, (void *)data, sizeof(elf_fpregset_t))) {
@@ -375,10 +326,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                ret = ptrace_request(child, request, addr, data);
                goto out;
        }
-out_tsk:
-       put_task_struct(child);
-out:
-       unlock_kernel();
+ out:
        return ret;
 }