diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-09 01:51:57 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-09 01:51:57 +0100 |
| commit | 59603b9ae426e968d452f9325cdcff308573dee7 (patch) | |
| tree | f54c52cbf4874a28f88c65fce659daee20b0f41f /arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | |
| parent | Linux 2.6.34-rc1 (diff) | |
| parent | powerpc/perf: e500 support (diff) | |
| download | linux-59603b9ae426e968d452f9325cdcff308573dee7.tar.xz linux-59603b9ae426e968d452f9325cdcff308573dee7.zip | |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/platforms/82xx/pq2ads-pci-pic.c')
| -rw-r--r-- | arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c index 9d962d7c72c1..d4a09f8705b5 100644 --- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c @@ -24,7 +24,7 @@ #include "pq2.h" -static DEFINE_SPINLOCK(pci_pic_lock); +static DEFINE_RAW_SPINLOCK(pci_pic_lock); struct pq2ads_pci_pic { struct device_node *node; @@ -45,12 +45,12 @@ static void pq2ads_pci_mask_irq(unsigned int virq) if (irq != -1) { unsigned long flags; - spin_lock_irqsave(&pci_pic_lock, flags); + raw_spin_lock_irqsave(&pci_pic_lock, flags); setbits32(&priv->regs->mask, 1 << irq); mb(); - spin_unlock_irqrestore(&pci_pic_lock, flags); + raw_spin_unlock_irqrestore(&pci_pic_lock, flags); } } @@ -62,9 +62,9 @@ static void pq2ads_pci_unmask_irq(unsigned int virq) if (irq != -1) { unsigned long flags; - spin_lock_irqsave(&pci_pic_lock, flags); + raw_spin_lock_irqsave(&pci_pic_lock, flags); clrbits32(&priv->regs->mask, 1 << irq); - spin_unlock_irqrestore(&pci_pic_lock, flags); + raw_spin_unlock_irqrestore(&pci_pic_lock, flags); } } |