Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c
index 38ece0cd47cbbd4c6195b9e9bc1dbcc13f80e353..dd401473f5b5e8742a1f424e7650a0265c28fdbc 100644 (file)
--- a/arch/cris/arch-v32/kernel/ptrace.c
+++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003, Axis Communications AB.
+ * Copyright (C) 2000-2007, Axis Communications AB.
  */
 
 #include <linux/kernel.h>
@@ -17,7 +17,7 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/processor.h>
-#include <asm/arch/hwregs/supp_reg.h>
+#include <arch/hwregs/supp_reg.h>
 
 /*
  * Determines which bits in CCS the user has access to.
@@ -149,7 +149,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        ret = generic_ptrace_pokedata(child, addr, data);
                        break;
 
-               /* Write the word at location address in the USER area. */
+               /* Write the word at location address in the USER area. */
                case PTRACE_POKEUSR:
                        ret = -EIO;
                        if ((addr & 3) || addr < 0 || addr > PT_MAX << 2)
@@ -201,7 +201,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
                        break;
 
-               /* Make the child exit by sending it a sigkill. */
+               /* Make the child exit by sending it a sigkill. */
                case PTRACE_KILL:
                        ret = 0;
 
@@ -245,13 +245,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        break;
 
                }
-               case PTRACE_DETACH:
-                       ret = ptrace_detach(child, data);
-                       break;
 
                /* Get all GP registers from the child. */
                case PTRACE_GETREGS: {
-                       int i;
+                       int i;
                        unsigned long tmp;
 
                        for (i = 0; i <= PT_MAX; i++) {
@@ -298,6 +295,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        break;
        }
 
+out_tsk:
        return ret;
 }