From: Kumar Gala Date: Thu, 6 Oct 2011 02:53:39 +0000 (+0000) Subject: powerpc: Remove extraneous CONFIG_PPC_ADV_DEBUG_REGS define X-Git-Tag: v3.2-rc3~41^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b95bc2191412f5ecf2781c966110a13fa82a80d3;p=profile%2Fcommon%2Fkernel-common.git 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 Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 4e59082..5459d14 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);