From 428dd60debe2df66a3a3f05d94738248ab251345 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 11 Jan 2011 19:47:20 +0000 Subject: [PATCH] --- yaml --- r: 232060 b: refs/heads/master c: dfb5509f8f49ffd52922060c830978ed5a9b9731 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/traps.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 236274f1931d..6195932405d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f9793e6b66efcf196974ee4f0d62de6282eb41b +refs/heads/master: dfb5509f8f49ffd52922060c830978ed5a9b9731 diff --git a/trunk/arch/powerpc/kernel/traps.c b/trunk/arch/powerpc/kernel/traps.c index 6865002df6ce..9e24224962d9 100644 --- a/trunk/arch/powerpc/kernel/traps.c +++ b/trunk/arch/powerpc/kernel/traps.c @@ -648,8 +648,6 @@ void machine_check_exception(struct pt_regs *regs) if (check_io_access(regs)) return; - if (debugger_fault_handler(regs)) - return; die("Machine check", regs, SIGBUS); /* Must die if the interrupt is not recoverable */