2 files changed, 1 insertions, 5 deletions

diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index 06a13d9b69db..5533c7850d53 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -304,10 +304,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 ret = put_user(sizeof(elf_fpregset_t), (unsigned long *) data);
                 break;
 
-        case PTRACE_DETACH: /* detach a process that was attached. */
-                ret = ptrace_detach(child, data);
-                break;
-
         default:
                 ret = ptrace_request(child, request, addr, data);
                 goto out;
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 45d28f217c03..2f842859948f 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -152,7 +152,7 @@ out_of_memory:
         }
         printk("VM: killing process %s\n", current->comm);
         if (user_mode(regs))
-                do_exit(SIGKILL);
+                do_group_exit(SIGKILL);
         bad_page_fault(regs, address, SIGKILL);
         return;