3 files changed, 12 insertions, 12 deletions

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 9fa2c7dcd05a..ef149880c145 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -736,15 +736,16 @@ void user_disable_single_step(struct task_struct *task)
 {
         struct pt_regs *regs = task->thread.regs;
 
-
-#if defined(CONFIG_BOOKE)
-        /* If DAC then do not single step, skip */
-        if (task->thread.dabr)
-                return;
-#endif
-
         if (regs != NULL) {
-#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
+#if defined(CONFIG_BOOKE)
+                /* If DAC don't clear DBCRO_IDM or MSR_DE */
+                if (task->thread.dabr)
+                        task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT);
+                else {
+                        task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM);
+                        regs->msr &= ~MSR_DE;
+                }
+#elif defined(CONFIG_40x)
                 task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM);
                 regs->msr &= ~MSR_DE;
 #else
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 297632cba047..8a6daf4129f6 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -21,7 +21,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/regset.h>
diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index ef36cbbc5882..ea4d64644d02 100644
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -80,10 +80,10 @@ _GLOBAL(load_up_altivec)
         mtvscr  vr0
         REST_32VRS(0,r4,r5)
 #ifndef CONFIG_SMP
-        /* Update last_task_used_math to 'current' */
+        /* Update last_task_used_altivec to 'current' */
         subi    r4,r5,THREAD            /* Back to 'current' */
         fromreal(r4)
-        PPC_STL r4,ADDROFF(last_task_used_math)(r3)
+        PPC_STL r4,ADDROFF(last_task_used_altivec)(r3)
 #endif /* CONFIG_SMP */
         /* restore registers and return */
         blr
@@ -172,7 +172,7 @@ _GLOBAL(load_up_vsx)
         oris    r12,r12,MSR_VSX@h
         std     r12,_MSR(r1)
 #ifndef CONFIG_SMP
-        /* Update last_task_used_math to 'current' */
+        /* Update last_task_used_vsx to 'current' */
         ld      r4,PACACURRENT(r13)
         std     r4,0(r3)
 #endif /* CONFIG_SMP */