2 files changed, 2 insertions, 28 deletions

diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index 0619958ecfdc..29fa6e5cb450 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -556,8 +556,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                 goto out;
         }
 
-        if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
-            || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
+        if (request == PTRACE_ATTACH) {
                 if (ptrace_attach(child)) {
                         pt_error_return(regs, EPERM);
                         goto out_tsk;
@@ -789,18 +788,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                 goto out_tsk;
         }
 
-        case PTRACE_SUNDETACH: { /* detach a process that was attached. */
-                int err = ptrace_detach(child, data);
-                if (err) {
-                        pt_error_return(regs, EIO);
-                        goto out_tsk;
-                }
-                pt_succ_return(regs, 0);
-                goto out_tsk;
-        }
-
-        /* PTRACE_DUMPCORE unsupported... */
-
         default: {
                 int err = ptrace_request(child, request, addr, data);
                 if (err)
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 2232e85c8415..e881dbbd2c49 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -766,8 +766,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                 goto out;
         }
 
-        if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
-            || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
+        if (request == PTRACE_ATTACH) {
                 if (ptrace_attach(child)) {
                         pt_error_return(regs, EPERM);
                         goto out_tsk;
@@ -1137,18 +1136,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                 goto out_tsk;
         }
 
-        case PTRACE_SUNDETACH: { /* detach a process that was attached. */
-                int error = ptrace_detach(child, data);
-                if (error) {
-                        pt_error_return(regs, EIO);
-                        goto out_tsk;
-                }
-                pt_succ_return(regs, 0);
-                goto out_tsk;
-        }
-
-        /* PTRACE_DUMPCORE unsupported... */
-
         case PTRACE_GETEVENTMSG: {
                 int err;