powerpc: Remove extraneous CONFIG_PPC_ADV_DEBUG_REGS define
authorKumar Gala <galak@kernel.crashing.org>
Thu, 6 Oct 2011 02:53:39 +0000 (02:53 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 17 Nov 2011 05:26:07 +0000 (16:26 +1100)
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>
arch/powerpc/kernel/traps.c

index 4e5908264d1a98819a6713fe23f4d5a23032db41..5459d148a0f6d792fd457bd55e2105788057169b 100644 (file)
@@ -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);