From: Paul Mackerras <paulus@samba.org>
Date: Tue, 3 Oct 2006 11:32:49 +0000 (+1000)
Subject: [POWERPC] Don't try to just continue if xmon has no input device
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0a730ae59960165ae50de3284fb50316d1755d98;p=deliverable%2Flinux.git

[POWERPC] Don't try to just continue if xmon has no input device

Currently, if xmon has no input device (as is generally the case on
G5 powermacs), and we drop into xmon as a result of a fatal exception,
it will return 1, which die() interprets as "continue without causing
an oops".  This fixes it by making xmon() return 0 in the case where
it has no input device.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index b54ff980ecd4..708236f34746 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -505,7 +505,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
 
 	mtmsr(msr);		/* restore interrupt enable */
 
-	return cmd != 'X';
+	return cmd != 'X' && cmd != EOF;
 }
 
 int xmon(struct pt_regs *excp)