From cf8137283d0aa58a6e2f4d1c148d7047a59492d0 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 6 Oct 2011 02:53:39 +0000
Subject: [PATCH] --- yaml --- r: 275549 b: refs/heads/master c:
 b95bc2191412f5ecf2781c966110a13fa82a80d3 h: refs/heads/master i:   275547:
 b674ce1e183d806a1fd1babec056b4cd255356f7 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/powerpc/kernel/traps.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4987239b4f6c..8870913c0ad6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba28c9aae26ef7f3651eef6835fae30a979f88ba
+refs/heads/master: b95bc2191412f5ecf2781c966110a13fa82a80d3
diff --git a/trunk/arch/powerpc/kernel/traps.c b/trunk/arch/powerpc/kernel/traps.c
index 4e5908264d1a..5459d148a0f6 100644
--- a/trunk/arch/powerpc/kernel/traps.c
+++ b/trunk/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);