diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 12:53:31 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 12:53:31 +0100 |
| commit | 4a41abe5960b6a4d496aab94264beee06bc0ab7e (patch) | |
| tree | 40203229eed66bdd87da6b2b91bc911e24da2ee0 /arch/mips/jazz | |
| parent | 4a8a738de637dc7141de5228d2d722573a329b95 (diff) | |
| download | linux-stable-4a41abe5960b6a4d496aab94264beee06bc0ab7e.tar.gz linux-stable-4a41abe5960b6a4d496aab94264beee06bc0ab7e.tar.bz2 linux-stable-4a41abe5960b6a4d496aab94264beee06bc0ab7e.zip | |
MIPS: Jazz: Convert irq controller lock to raw spinlock.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/jazz')
| -rw-r--r-- | arch/mips/jazz/irq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 7bd32d04c2cc..ee18028efe92 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c @@ -20,17 +20,17 @@ #include <asm/jazz.h> #include <asm/pgtable.h> -static DEFINE_SPINLOCK(r4030_lock); +static DEFINE_RAW_SPINLOCK(r4030_lock); static void enable_r4030_irq(unsigned int irq) { unsigned int mask = 1 << (irq - JAZZ_IRQ_START); unsigned long flags; - spin_lock_irqsave(&r4030_lock, flags); + raw_spin_lock_irqsave(&r4030_lock, flags); mask |= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE); r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask); - spin_unlock_irqrestore(&r4030_lock, flags); + raw_spin_unlock_irqrestore(&r4030_lock, flags); } void disable_r4030_irq(unsigned int irq) @@ -38,10 +38,10 @@ void disable_r4030_irq(unsigned int irq) unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START)); unsigned long flags; - spin_lock_irqsave(&r4030_lock, flags); + raw_spin_lock_irqsave(&r4030_lock, flags); mask &= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE); r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask); - spin_unlock_irqrestore(&r4030_lock, flags); + raw_spin_unlock_irqrestore(&r4030_lock, flags); } static struct irq_chip r4030_irq_type = { |