Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/avr32/kernel/ptrace.c b/arch/avr32/kernel/ptrace.c
index 002369e4409335f0515035f8d3b824d33e7edf74..1fed38fcf594cdfd043707a1d31b958ce8c4f8b0 100644 (file)
--- a/arch/avr32/kernel/ptrace.c
+++ b/arch/avr32/kernel/ptrace.c
@@ -58,6 +58,7 @@ void ptrace_disable(struct task_struct *child)
 {
        clear_tsk_thread_flag(child, TIF_SINGLE_STEP);
        clear_tsk_thread_flag(child, TIF_BREAKPOINT);
+       ocd_disable(child);
 }
 
 /*
@@ -144,10 +145,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
        int ret;
 
-       pr_debug("ptrace: Enabling monitor mode...\n");
-       ocd_write(DC, ocd_read(DC) | (1 << OCD_DC_MM_BIT)
-                       | (1 << OCD_DC_DBE_BIT));
-
        switch (request) {
        /* Read the word at location addr in the child process */
        case PTRACE_PEEKTEXT: