Index: kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c
===================================================================
--- kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision 5e629ad488e0e5d27b616c452352f3cedc9f2db5)
+++ kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision b1f0a141d37cd3a919a708e87dbff0bd6527788e)
@@ -92,7 +92,7 @@
 	 * Release the lock, call clock() and reacquire the lock again.
 	 */
-	spinlock_unlock(&irq->lock);
+	irq_spinlock_unlock(&irq->lock, false);
 	clock();
-	spinlock_lock(&irq->lock);
+	irq_spinlock_lock(&irq->lock, false);
 }
 
@@ -156,5 +156,5 @@
 		/* The IRQ handler was found. */
 		irq->handler(irq);
-		spinlock_unlock(&irq->lock);
+		irq_spinlock_unlock(&irq->lock, false);
 	} else {
 		/* Spurious interrupt. */
Index: kernel/arch/arm32/src/mach/beaglebone/beaglebone.c
===================================================================
--- kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision 5e629ad488e0e5d27b616c452352f3cedc9f2db5)
+++ kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision b1f0a141d37cd3a919a708e87dbff0bd6527788e)
@@ -117,7 +117,7 @@
 {
 	am335x_timer_intr_ack(&bbone.timer);
-	spinlock_unlock(&irq->lock);
+	irq_spinlock_unlock(&irq->lock, false);
 	clock();
-	spinlock_lock(&irq->lock);
+	irq_spinlock_lock(&irq->lock, false);
 }
 
@@ -184,5 +184,5 @@
 		/* The IRQ handler was found. */
 		irq->handler(irq);
-		spinlock_unlock(&irq->lock);
+		irq_spinlock_unlock(&irq->lock, false);
 	} else {
 		printf("Spurious interrupt\n");
Index: kernel/arch/arm32/src/mach/gta02/gta02.c
===================================================================
--- kernel/arch/arm32/src/mach/gta02/gta02.c	(revision 5e629ad488e0e5d27b616c452352f3cedc9f2db5)
+++ kernel/arch/arm32/src/mach/gta02/gta02.c	(revision b1f0a141d37cd3a919a708e87dbff0bd6527788e)
@@ -146,5 +146,5 @@
 		/* The IRQ handler was found. */
 		irq->handler(irq);
-		spinlock_unlock(&irq->lock);
+		irq_spinlock_unlock(&irq->lock, false);
 	} else {
 		/* Spurious interrupt. */
@@ -258,7 +258,7 @@
 	 * Release the lock, call clock() and reacquire the lock again.
 	 */
-	spinlock_unlock(&irq->lock);
+	irq_spinlock_unlock(&irq->lock, false);
 	clock();
-	spinlock_lock(&irq->lock);
+	irq_spinlock_lock(&irq->lock, false);
 }
 
Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
===================================================================
--- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 5e629ad488e0e5d27b616c452352f3cedc9f2db5)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision b1f0a141d37cd3a919a708e87dbff0bd6527788e)
@@ -197,7 +197,7 @@
 	 */
 
-	spinlock_unlock(&irq->lock);
+	irq_spinlock_unlock(&irq->lock, false);
 	clock();
-	spinlock_lock(&irq->lock);
+	irq_spinlock_lock(&irq->lock, false);
 
 }
@@ -268,5 +268,5 @@
 				/* The IRQ handler was found. */
 				irq->handler(irq);
-				spinlock_unlock(&irq->lock);
+				irq_spinlock_unlock(&irq->lock, false);
 			} else {
 				/* Spurious interrupt. */
Index: kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c
===================================================================
--- kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision 5e629ad488e0e5d27b616c452352f3cedc9f2db5)
+++ kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision b1f0a141d37cd3a919a708e87dbff0bd6527788e)
@@ -94,7 +94,7 @@
 {
 	bcm2835_timer_irq_ack(raspi.timer);
-	spinlock_unlock(&irq->lock);
+	irq_spinlock_unlock(&irq->lock, false);
 	clock();
-	spinlock_lock(&irq->lock);
+	irq_spinlock_lock(&irq->lock, false);
 }
 
@@ -159,5 +159,5 @@
 		/* The IRQ handler was found. */
 		irq->handler(irq);
-		spinlock_unlock(&irq->lock);
+		irq_spinlock_unlock(&irq->lock, false);
 	} else {
 		/* Spurious interrupt. */