summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/ptrace.c
diff options
context:
space:
mode:
authorJames Yang2013-07-05 21:49:43 +0200
committerScott Wood2013-10-19 01:50:14 +0200
commit682775b8de995d97956447730c04d2ff978d4e13 (patch)
tree43b135a597ee4490b39208aeeaa1e1d6f4862518 /arch/powerpc/kernel/ptrace.c
parentpowerpc: export debug registers save function for KVM (diff)
downloadkernel-qcow2-linux-682775b8de995d97956447730c04d2ff978d4e13.tar.gz
kernel-qcow2-linux-682775b8de995d97956447730c04d2ff978d4e13.tar.xz
kernel-qcow2-linux-682775b8de995d97956447730c04d2ff978d4e13.zip
powerpc/booke: clear DBCR0_BT in user_disable_single_step()
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>
Diffstat (limited to 'arch/powerpc/kernel/ptrace.c')
-rw-r--r--arch/powerpc/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index aedfd41d354c..01be88b7321e 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -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.
*/