powerpc/booke: clear DBCR0_BT in user_disable_single_step()
authorJames Yang <James.Yang@freescale.com>
Fri, 5 Jul 2013 19:49:43 +0000 (14:49 -0500)
committerScott Wood <scottwood@freescale.com>
Fri, 18 Oct 2013 23:50:14 +0000 (18:50 -0500)
BookE version of user_disable_single_step() clears DBCR0_IC for the
instruction completion debug, but did not also clear DBCR0_BT for the
branch taken exception.  This behavior was lost by the 2/2010 patch.

Signed-off-by: James Yang <James.Yang@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
arch/powerpc/kernel/ptrace.c

index aedfd41d354ce5a1708f6f4d42455e1da63fc1f8..01be88b7321ed02dd277d9e3bcd26470b17b0528 100644 (file)
@@ -895,7 +895,7 @@ void user_disable_single_step(struct task_struct *task)
                 * And, after doing so, if all debug flags are off, turn
                 * off DBCR0(IDM) and MSR(DE) .... Torez
                 */
-               task->thread.debug.dbcr0 &= ~DBCR0_IC;
+               task->thread.debug.dbcr0 &= ~(DBCR0_IC|DBCR0_BT);
                /*
                 * Test to see if any of the DBCR_ACTIVE_EVENTS bits are set.
                 */