---

yaml --- r: 279517 b: refs/heads/master c: 08f6d6a h: refs/heads/master i: 279515: 8db23ec v: v3
git-mirror · Nov 25, 2011 · b5b9e4e · b5b9e4e
1 parent 7a24e91
commit b5b9e4e
Show file tree

Hide file tree

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