|
@@ -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 = {
|