From 4a3579b96f32fd3d270d860eada93f557d4a71fc Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Thu, 12 Feb 2009 13:39:33 +0100
Subject: [PATCH] --- yaml --- r: 131549 b: refs/heads/master c:
 380851bc6b1b4107c61dfa2997f9095dcf779336 h: refs/heads/master i:   131547:
 4ac4cb5d3bae216341d24758b5304f3b3e934c07 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dd7dbd46c53d..cf3893f80d51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ec68bff3c81e776a455f6aca95c8c5f1d630198
+refs/heads/master: 380851bc6b1b4107c61dfa2997f9095dcf779336
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
index 1f184efb6bc2..25cf624eccb7 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -295,11 +295,11 @@ void do_machine_check(struct pt_regs * regs, long error_code)
 		 * If we know that the error was in user space, send a
 		 * SIGBUS.  Otherwise, panic if tolerance is low.
 		 *
-		 * do_exit() takes an awful lot of locks and has a slight
+		 * force_sig() takes an awful lot of locks and has a slight
 		 * risk of deadlocking.
 		 */
 		if (user_space) {
-			do_exit(SIGBUS);
+			force_sig(SIGBUS, current);
 		} else if (panic_on_oops || tolerant < 2) {
 			mce_panic("Uncorrected machine check",
 				&panicm, mcestart);