diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2011-10-06 02:53:39 +0000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-17 16:26:07 +1100 |
commit | b95bc2191412f5ecf2781c966110a13fa82a80d3 (patch) | |
tree | a58c98bb553dd684998ca9f041a9cc203d147d1f /arch/powerpc | |
parent | ba28c9aae26ef7f3651eef6835fae30a979f88ba (diff) | |
download | linux-b95bc2191412f5ecf2781c966110a13fa82a80d3.tar.gz linux-b95bc2191412f5ecf2781c966110a13fa82a80d3.tar.bz2 linux-b95bc2191412f5ecf2781c966110a13fa82a80d3.zip |
powerpc: Remove extraneous CONFIG_PPC_ADV_DEBUG_REGS define
All of DebugException is already protected by CONFIG_PPC_ADV_DEBUG_REGS
there is no need to have another such ifdef inside the function.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/traps.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 4e5908264d1a..5459d148a0f6 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -1298,14 +1298,12 @@ void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status) if (user_mode(regs)) { current->thread.dbcr0 &= ~DBCR0_IC; -#ifdef CONFIG_PPC_ADV_DEBUG_REGS if (DBCR_ACTIVE_EVENTS(current->thread.dbcr0, current->thread.dbcr1)) regs->msr |= MSR_DE; else /* Make sure the IDM bit is off */ current->thread.dbcr0 &= ~DBCR0_IDM; -#endif } _exception(SIGTRAP, regs, TRAP_TRACE, regs->nip); |