diff --git a/[refs] b/[refs]
index cf53f272cf35..a7bcdf2e21a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ba53e37120fba00fa10bebc13b9723f25e1f845
+refs/heads/master: 598c5abad7f3e162a01c87a480f8d2cd57643acb
diff --git a/trunk/arch/mips/sgi-ip27/ip27-nmi.c b/trunk/arch/mips/sgi-ip27/ip27-nmi.c
index fa0872be0185..bc4fa8dd67f3 100644
--- a/trunk/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/trunk/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
 	/*