summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-10-03 21:32:49 +1000
committerPaul Mackerras <paulus@samba.org>2006-10-04 14:52:40 +1000
commit0a730ae59960165ae50de3284fb50316d1755d98 (patch)
tree88093744ceadc81ed62eba0d21055b94dcacad41 /arch
parent586da2cc78131d194ecacaf4de26b49691de5fd3 (diff)
downloadlinux-0a730ae59960165ae50de3284fb50316d1755d98.tar.bz2
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/xmon/xmon.c2
1 files changed, 1 insertions, 1 deletions
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)