From 162e9c980e9cae80c9d8f91151508f738b1f6197 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 27 Feb 2010 12:53:38 +0100
Subject: [PATCH] --- yaml --- r: 182132 b: refs/heads/master c:
 2ba53e37120fba00fa10bebc13b9723f25e1f845 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/mips/sgi-ip27/ip27-nmi.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 194bb05aff7c..cf53f272cf35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34ee4148472996c5fd25fbb5697982914cfe955a
+refs/heads/master: 2ba53e37120fba00fa10bebc13b9723f25e1f845
diff --git a/trunk/arch/mips/sgi-ip27/ip27-nmi.c b/trunk/arch/mips/sgi-ip27/ip27-nmi.c
index 8682784abfcf..fa0872be0185 100644
--- a/trunk/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/trunk/arch/mips/sgi-ip27/ip27-nmi.c
@@ -17,7 +17,6 @@
 #endif
 
 #define CNODEID_NONE (cnodeid_t)-1
-#define enter_panic_mode()	spin_lock(&nmi_lock)
 
 typedef unsigned long machreg_t;
 
@@ -193,9 +192,9 @@ cont_nmi_dump(void)
 	atomic_inc(&nmied_cpus);
 #endif
 	/*
-	 * Use enter_panic_mode to allow only 1 cpu to proceed
+	 * Only allow 1 cpu to proceed
 	 */
-	enter_panic_mode();
+	spin_lock(&nmi_lock);
 
 #ifdef REAL_NMI_SIGNAL
 	/*