3 files changed, 14 insertions, 15 deletions

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 4070268aa769..06e25d949768 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -73,14 +73,14 @@ static struct irq_chip bcm1480_irq_type = {
 /* Store the CPU id (not the logical number) */
 int bcm1480_irq_owner[BCM1480_NR_IRQS];
 
-DEFINE_SPINLOCK(bcm1480_imr_lock);
+static DEFINE_RAW_SPINLOCK(bcm1480_imr_lock);
 
 void bcm1480_mask_irq(int cpu, int irq)
 {
         unsigned long flags, hl_spacing;
         u64 cur_ints;
 
-        spin_lock_irqsave(&bcm1480_imr_lock, flags);
+        raw_spin_lock_irqsave(&bcm1480_imr_lock, flags);
         hl_spacing = 0;
         if ((irq >= BCM1480_NR_IRQS_HALF) && (irq <= BCM1480_NR_IRQS)) {
                 hl_spacing = BCM1480_IMR_HL_SPACING;
@@ -89,7 +89,7 @@ void bcm1480_mask_irq(int cpu, int irq)
         cur_ints = ____raw_readq(IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + hl_spacing));
         cur_ints |= (((u64) 1) << irq);
         ____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + hl_spacing));
-        spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
+        raw_spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
 }
 
 void bcm1480_unmask_irq(int cpu, int irq)
@@ -97,7 +97,7 @@ void bcm1480_unmask_irq(int cpu, int irq)
         unsigned long flags, hl_spacing;
         u64 cur_ints;
 
-        spin_lock_irqsave(&bcm1480_imr_lock, flags);
+        raw_spin_lock_irqsave(&bcm1480_imr_lock, flags);
         hl_spacing = 0;
         if ((irq >= BCM1480_NR_IRQS_HALF) && (irq <= BCM1480_NR_IRQS)) {
                 hl_spacing = BCM1480_IMR_HL_SPACING;
@@ -106,7 +106,7 @@ void bcm1480_unmask_irq(int cpu, int irq)
         cur_ints = ____raw_readq(IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + hl_spacing));
         cur_ints &= ~(((u64) 1) << irq);
         ____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + hl_spacing));
-        spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
+        raw_spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
 }
 
 #ifdef CONFIG_SMP
@@ -123,7 +123,7 @@ static int bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
         cpu = cpu_logical_map(i);
 
         /* Protect against other affinity changers and IMR manipulation */
-        spin_lock_irqsave(&bcm1480_imr_lock, flags);
+        raw_spin_lock_irqsave(&bcm1480_imr_lock, flags);
 
         /* Swizzle each CPU's IMR (but leave the IP selection alone) */
         old_cpu = bcm1480_irq_owner[irq];
@@ -148,7 +148,7 @@ static int bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
                         ____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
                 }
         }
-        spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
+        raw_spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
 
         return 0;
 }
diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c
index 15ea778b5e66..ed2453eab5cb 100644
--- a/arch/mips/sibyte/common/sb_tbprof.c
+++ b/arch/mips/sibyte/common/sb_tbprof.c
@@ -28,7 +28,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/errno.h>
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 5e7f2016cceb..ab44a2f59ee4 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -72,20 +72,20 @@ static struct irq_chip sb1250_irq_type = {
 /* Store the CPU id (not the logical number) */
 int sb1250_irq_owner[SB1250_NR_IRQS];
 
-DEFINE_SPINLOCK(sb1250_imr_lock);
+static DEFINE_RAW_SPINLOCK(sb1250_imr_lock);
 
 void sb1250_mask_irq(int cpu, int irq)
 {
         unsigned long flags;
         u64 cur_ints;
 
-        spin_lock_irqsave(&sb1250_imr_lock, flags);
+        raw_spin_lock_irqsave(&sb1250_imr_lock, flags);
         cur_ints = ____raw_readq(IOADDR(A_IMR_MAPPER(cpu) +
                                         R_IMR_INTERRUPT_MASK));
         cur_ints |= (((u64) 1) << irq);
         ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
                                         R_IMR_INTERRUPT_MASK));
-        spin_unlock_irqrestore(&sb1250_imr_lock, flags);
+        raw_spin_unlock_irqrestore(&sb1250_imr_lock, flags);
 }
 
 void sb1250_unmask_irq(int cpu, int irq)
@@ -93,13 +93,13 @@ void sb1250_unmask_irq(int cpu, int irq)
         unsigned long flags;
         u64 cur_ints;
 
-        spin_lock_irqsave(&sb1250_imr_lock, flags);
+        raw_spin_lock_irqsave(&sb1250_imr_lock, flags);
         cur_ints = ____raw_readq(IOADDR(A_IMR_MAPPER(cpu) +
                                         R_IMR_INTERRUPT_MASK));
         cur_ints &= ~(((u64) 1) << irq);
         ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
                                         R_IMR_INTERRUPT_MASK));
-        spin_unlock_irqrestore(&sb1250_imr_lock, flags);
+        raw_spin_unlock_irqrestore(&sb1250_imr_lock, flags);
 }
 
 #ifdef CONFIG_SMP
@@ -115,7 +115,7 @@ static int sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
         cpu = cpu_logical_map(i);
 
         /* Protect against other affinity changers and IMR manipulation */
-        spin_lock_irqsave(&sb1250_imr_lock, flags);
+        raw_spin_lock_irqsave(&sb1250_imr_lock, flags);
 
         /* Swizzle each CPU's IMR (but leave the IP selection alone) */
         old_cpu = sb1250_irq_owner[irq];
@@ -137,7 +137,7 @@ static int sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
                 ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
                                         R_IMR_INTERRUPT_MASK));
         }
-        spin_unlock_irqrestore(&sb1250_imr_lock, flags);
+        raw_spin_unlock_irqrestore(&sb1250_imr_lock, flags);
 
         return 0;
 }