From e6f57c945c81374f0c1ba6c6b58e1d11ce0609de Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Thu, 18 Feb 2010 16:57:38 +0300 Subject: [PATCH] --- yaml --- r: 187783 b: refs/heads/master c: 0e5d359cca2d685311c4eaeb570f2e7e7915da31 h: refs/heads/master i: 187781: f7d2b5b3015bd27c87ff55b2d9ae5b58231a9a7d 187779: 53a72efef4946ceda3cbf7e86c014ac36f5fd1db 187775: ef71e1eddfdd3322af862b79181f38f966a5cf38 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 295487c63a7e..747a076ea74d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e026f72cf05137e0b52b7aa5420e95a76bd3195 +refs/heads/master: 0e5d359cca2d685311c4eaeb570f2e7e7915da31 diff --git a/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c index 9d962d7c72c1..d4a09f8705b5 100644 --- a/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +++ b/trunk/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); } }