From b5b9e4e096ccae811dcb18ecbcb840e0721dd474 Mon Sep 17 00:00:00 2001
From: Jimi Xenidis <jimix@pobox.com>
Date: Thu, 29 Sep 2011 12:05:28 +0000
Subject: [PATCH] --- yaml --- r: 279517 b: refs/heads/master c:
 08f6d6abc3eadb88f020075910e6f3a849e56690 h: refs/heads/master i:   279515:
 8db23ec87590061391f4e33a951d5a40e91b4620 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/powerpc/xmon/xmon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 236d9b5cd5d0..0f75c4d8dba3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79873e8df64cc124cdcad56d1d8330b3f45690bc
+refs/heads/master: 08f6d6abc3eadb88f020075910e6f3a849e56690
diff --git a/trunk/arch/powerpc/xmon/xmon.c b/trunk/arch/powerpc/xmon/xmon.c
index 95cf53b71499..cb95eea74d3d 100644
--- a/trunk/arch/powerpc/xmon/xmon.c
+++ b/trunk/arch/powerpc/xmon/xmon.c
@@ -338,7 +338,7 @@ int cpus_are_in_xmon(void)
 
 static inline int unrecoverable_excp(struct pt_regs *regs)
 {
-#if defined(CONFIG_4xx) || defined(CONFIG_BOOK3E)
+#if defined(CONFIG_4xx) || defined(CONFIG_PPC_BOOK3E)
 	/* We have no MSR_RI bit on 4xx or Book3e, so we simply return false */
 	return 0;
 #else