From 24490f03b6a9df05313a622ec7775b033d174dcd Mon Sep 17 00:00:00 2001
From: Jimi Xenidis <jimix@pobox.com>
Date: Fri, 23 Sep 2011 05:40:46 +0000
Subject: [PATCH] --- yaml --- r: 274206 b: refs/heads/master c:
 66857b3a9e88ac6f6e279eaa06b84367e662c0dd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7d7581a7426f..996f44a6eda1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb36c44557a4fcbaa17c0f2776e12a05a691b432
+refs/heads/master: 66857b3a9e88ac6f6e279eaa06b84367e662c0dd
diff --git a/trunk/arch/powerpc/xmon/xmon.c b/trunk/arch/powerpc/xmon/xmon.c
index 42541bbcc7fa..13f82f847669 100644
--- a/trunk/arch/powerpc/xmon/xmon.c
+++ b/trunk/arch/powerpc/xmon/xmon.c
@@ -340,8 +340,8 @@ int cpus_are_in_xmon(void)
 
 static inline int unrecoverable_excp(struct pt_regs *regs)
 {
-#ifdef CONFIG_4xx
-	/* We have no MSR_RI bit on 4xx, so we simply return false */
+#if defined(CONFIG_4xx) || defined(CONFIG_BOOK3E)
+	/* We have no MSR_RI bit on 4xx or Book3e, so we simply return false */
 	return 0;
 #else
 	return ((regs->msr & MSR_RI) == 0);