---

yaml --- r: 274206 b: refs/heads/master c: 66857b3 h: refs/heads/master v: v3
git-mirror · Sep 29, 2011 · 24490f0 · 24490f0
1 parent 27a4537
commit 24490f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);