diff options
| author | James Yang <James.Yang@freescale.com> | 2013-07-05 19:49:43 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 00:12:24 (GMT) |
| commit | fbbf89f0c93beb56cde28bc00b5962c01457ea18 (patch) | |
| tree | 9233dc60a00d06809fff8cb6c22806b698f61b15 /arch/powerpc/kernel/ptrace.c | |
| parent | 92690874bd84681a7f72cb138ddda0d04cb3f8c5 (diff) | |
| download | linux-fsl-qoriq-fbbf89f0c93beb56cde28bc00b5962c01457ea18.tar.xz | |
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>
(cherry picked from commit 682775b8de995d97956447730c04d2ff978d4e13)
Diffstat (limited to 'arch/powerpc/kernel/ptrace.c')
| -rw-r--r-- | arch/powerpc/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index ddaf178..bd92ba0 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -894,7 +894,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. */ |