浏览代码

[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>
Paul Mackerras 18 年之前
父节点
当前提交
0a730ae599
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/powerpc/xmon/xmon.c

+ 1 - 1
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)