From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 27 Feb 2010 11:53:38 +0000 (+0100)
Subject: MIPS: IP27: Convert nmi_lock lock to arch spinlock;
X-Git-Tag: v2.6.34-rc1~269^2~20
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=598c5abad7f3e162a01c87a480f8d2cd57643acb;p=net-next-2.6.git

MIPS: IP27: Convert nmi_lock lock to arch spinlock;

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
index fa0872be018..bc4fa8dd67f 100644
--- a/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/arch/mips/sgi-ip27/ip27-nmi.c
@@ -20,7 +20,7 @@
 
 typedef unsigned long machreg_t;
 
-static DEFINE_SPINLOCK(nmi_lock);
+static arch_spinlock_t nmi_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 
 /*
  * Lets see what else we need to do here. Set up sp, gp?
@@ -194,7 +194,7 @@ cont_nmi_dump(void)
 	/*
 	 * Only allow 1 cpu to proceed
 	 */
-	spin_lock(&nmi_lock);
+	arch_spin_lock(&nmi_lock);
 
 #ifdef REAL_NMI_SIGNAL
 	/*