1 files changed, 19 insertions, 19 deletions

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 3b62896f9a5b..630a533d0e59 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -57,7 +57,7 @@ static int max_irqs;
 static int max_real_irqs;
 static u32 level_mask[4];
 
-static DEFINE_SPINLOCK(pmac_pic_lock);
+static DEFINE_RAW_SPINLOCK(pmac_pic_lock);
 
 #define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
 static unsigned long ppc_lost_interrupts[NR_MASK_WORDS];
@@ -85,7 +85,7 @@ static void pmac_mask_and_ack_irq(unsigned int virq)
         int i = src >> 5;
         unsigned long flags;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __clear_bit(src, ppc_cached_irq_mask);
         if (__test_and_clear_bit(src, ppc_lost_interrupts))
                 atomic_dec(&ppc_n_lost_interrupts);
@@ -97,7 +97,7 @@ static void pmac_mask_and_ack_irq(unsigned int virq)
                 mb();
         } while((in_le32(&pmac_irq_hw[i]->enable) & bit)
                 != (ppc_cached_irq_mask[i] & bit));
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
 static void pmac_ack_irq(unsigned int virq)
@@ -107,12 +107,12 @@ static void pmac_ack_irq(unsigned int virq)
         int i = src >> 5;
         unsigned long flags;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         if (__test_and_clear_bit(src, ppc_lost_interrupts))
                 atomic_dec(&ppc_n_lost_interrupts);
         out_le32(&pmac_irq_hw[i]->ack, bit);
         (void)in_le32(&pmac_irq_hw[i]->ack);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
 static void __pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)
@@ -152,12 +152,12 @@ static unsigned int pmac_startup_irq(unsigned int virq)
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         if ((irq_to_desc(virq)->status & IRQ_LEVEL) == 0)
                 out_le32(&pmac_irq_hw[i]->ack, bit);
         __set_bit(src, ppc_cached_irq_mask);
         __pmac_set_irq_mask(src, 0);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 
         return 0;
 }
@@ -167,10 +167,10 @@ static void pmac_mask_irq(unsigned int virq)
         unsigned long flags;
         unsigned int src = irq_map[virq].hwirq;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __clear_bit(src, ppc_cached_irq_mask);
         __pmac_set_irq_mask(src, 1);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
 static void pmac_unmask_irq(unsigned int virq)
@@ -178,19 +178,19 @@ static void pmac_unmask_irq(unsigned int virq)
         unsigned long flags;
         unsigned int src = irq_map[virq].hwirq;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __set_bit(src, ppc_cached_irq_mask);
         __pmac_set_irq_mask(src, 0);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 
 static int pmac_retrigger(unsigned int virq)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __pmac_retrigger(irq_map[virq].hwirq);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
         return 1;
 }
 
@@ -210,7 +210,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)
         int irq, bits;
         int rc = IRQ_NONE;
 
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         for (irq = max_irqs; (irq -= 32) >= max_real_irqs; ) {
                 int i = irq >> 5;
                 bits = in_le32(&pmac_irq_hw[i]->event) | ppc_lost_interrupts[i];
@@ -220,12 +220,12 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)
                 if (bits == 0)
                         continue;
                 irq += __ilog2(bits);
-                spin_unlock_irqrestore(&pmac_pic_lock, flags);
+                raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
                 generic_handle_irq(irq);
-                spin_lock_irqsave(&pmac_pic_lock, flags);
+                raw_spin_lock_irqsave(&pmac_pic_lock, flags);
                 rc = IRQ_HANDLED;
         }
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
         return rc;
 }
 
@@ -244,7 +244,7 @@ static unsigned int pmac_pic_get_irq(void)
                 return NO_IRQ_IGNORE;   /* ignore, already handled */
         }
 #endif /* CONFIG_SMP */
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         for (irq = max_real_irqs; (irq -= 32) >= 0; ) {
                 int i = irq >> 5;
                 bits = in_le32(&pmac_irq_hw[i]->event) | ppc_lost_interrupts[i];
@@ -256,7 +256,7 @@ static unsigned int pmac_pic_get_irq(void)
                 irq += __ilog2(bits);
                 break;
         }
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
         if (unlikely(irq < 0))
                 return NO_IRQ;
         return irq_linear_revmap(pmac_pic_host, irq);