aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-02-27 12:53:38 +0100
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 12:53:38 +0100
commit896508705561bea24656680cdaf3b4095c4d7473 (patch)
treec02b21f167c46e6b20c60f74810121829e65a56e /arch/mips/include
parent598c5abad7f3e162a01c87a480f8d2cd57643acb (diff)
downloadkernel_samsung_crespo-896508705561bea24656680cdaf3b4095c4d7473.zip
kernel_samsung_crespo-896508705561bea24656680cdaf3b4095c4d7473.tar.gz
kernel_samsung_crespo-896508705561bea24656680cdaf3b4095c4d7473.tar.bz2
MIPS: i8259: Convert IRQ controller lock to raw spinlock.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/i8259.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/i8259.h b/arch/mips/include/asm/i8259.h
index 8572a2d..c7e2784 100644
--- a/arch/mips/include/asm/i8259.h
+++ b/arch/mips/include/asm/i8259.h
@@ -35,7 +35,7 @@
#define SLAVE_ICW4_DEFAULT 0x01
#define PIC_ICW4_AEOI 2
-extern spinlock_t i8259A_lock;
+extern raw_spinlock_t i8259A_lock;
extern int i8259A_irq_pending(unsigned int irq);
extern void make_8259A_irq(unsigned int irq);
@@ -51,7 +51,7 @@ static inline int i8259_irq(void)
{
int irq;
- spin_lock(&i8259A_lock);
+ raw_spin_lock(&i8259A_lock);
/* Perform an interrupt acknowledge cycle on controller 1. */
outb(0x0C, PIC_MASTER_CMD); /* prepare for poll */
@@ -78,7 +78,7 @@ static inline int i8259_irq(void)
irq = -1;
}
- spin_unlock(&i8259A_lock);
+ raw_spin_unlock(&i8259A_lock);
return likely(irq >= 0) ? irq + I8259A_IRQ_BASE : irq;
}