2 files changed, 13 insertions, 47 deletions

diff --git a/arch/alpha/include/asm/ptrace.h b/arch/alpha/include/asm/ptrace.h
index 32c7a5cddd59..65cf3e28e2f4 100644
--- a/arch/alpha/include/asm/ptrace.h
+++ b/arch/alpha/include/asm/ptrace.h
@@ -68,6 +68,7 @@ struct switch_stack {
 
 #ifdef __KERNEL__
 
+#define arch_has_single_step()          (1)
 #define user_mode(regs) (((regs)->ps & 8) != 0)
 #define instruction_pointer(regs) ((regs)->pc)
 #define profile_pc(regs) instruction_pointer(regs)
diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
index e072041d19f8..9acadc6b16a0 100644
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
@@ -249,6 +249,17 @@ ptrace_cancel_bpt(struct task_struct * child)
         return (nsaved != 0);
 }
 
+void user_enable_single_step(struct task_struct *child)
+{
+        /* Mark single stepping.  */
+        task_thread_info(child)->bpt_nsaved = -1;
+}
+
+void user_disable_single_step(struct task_struct *child)
+{
+        ptrace_cancel_bpt(child);
+}
+
 /*
  * Called by kernel/ptrace.c when detaching..
  *
@@ -256,7 +267,7 @@ ptrace_cancel_bpt(struct task_struct * child)
  */
 void ptrace_disable(struct task_struct *child)
 { 
-        ptrace_cancel_bpt(child);
+        user_disable_single_step(child);
 }
 
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
@@ -295,52 +306,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 DBG(DBG_MEM, ("poke $%ld<-%#lx\n", addr, data));
                 ret = put_reg(child, addr, data);
                 break;
-
-        case PTRACE_SYSCALL:
-                /* continue and stop at next (return from) syscall */
-        case PTRACE_CONT:    /* restart after signal. */
-                ret = -EIO;
-                if (!valid_signal(data))
-                        break;
-                if (request == PTRACE_SYSCALL)
-                        set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                else
-                        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                child->exit_code = data;
-                /* make sure single-step breakpoint is gone. */
-                ptrace_cancel_bpt(child);
-                wake_up_process(child);
-                ret = 0;
-                break;
-
-        /*
-         * Make the child exit.  Best I can do is send it a sigkill.
-         * perhaps it should be put in the status that it wants to
-         * exit.
-         */
-        case PTRACE_KILL:
-                ret = 0;
-                if (child->exit_state == EXIT_ZOMBIE)
-                        break;
-                child->exit_code = SIGKILL;
-                /* make sure single-step breakpoint is gone. */
-                ptrace_cancel_bpt(child);
-                wake_up_process(child);
-                break;
-
-        case PTRACE_SINGLESTEP:  /* execute single instruction. */
-                ret = -EIO;
-                if (!valid_signal(data))
-                        break;
-                /* Mark single stepping.  */
-                task_thread_info(child)->bpt_nsaved = -1;
-                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-                child->exit_code = data;
-                wake_up_process(child);
-                /* give it a chance to run. */
-                ret = 0;
-                break;
-
         default:
                 ret = ptrace_request(child, request, addr, data);
                 break;