* [PATCH] sh: remove cli()/sti() in arch/sh/boards/mpc1211/setup.c
@ 2005-01-05 1:10 James Nelson
0 siblings, 0 replies; only message in thread
From: James Nelson @ 2005-01-05 1:10 UTC (permalink / raw)
To: linux-kernel, linux-sh; +Cc: lethal, James Nelson
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/sh/boards/mpc1211/setup.c linux-2.6.10-mm1/arch/sh/boards/mpc1211/setup.c
--- linux-2.6.10-mm1-original/arch/sh/boards/mpc1211/setup.c 2004-12-24 16:34:01.000000000 -0500
+++ linux-2.6.10-mm1/arch/sh/boards/mpc1211/setup.c 2005-01-04 20:06:16.543941867 -0500
@@ -83,7 +83,7 @@
{
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
if( irq < 8) {
m_irq_mask |= (1 << irq);
outb(m_irq_mask,I8259_M_MR);
@@ -91,7 +91,7 @@
s_irq_mask |= (1 << (irq - 8));
outb(s_irq_mask,I8259_S_MR);
}
- restore_flags(flags);
+ local_irq_restore(flags);
}
@@ -99,7 +99,7 @@
{
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
if( irq < 8) {
m_irq_mask &= ~(1 << irq);
@@ -108,7 +108,7 @@
s_irq_mask &= ~(1 << (irq - 8));
outb(s_irq_mask,I8259_S_MR);
}
- restore_flags(flags);
+ local_irq_restore(flags);
}
static inline int mpc1211_irq_real(unsigned int irq)
@@ -134,7 +134,7 @@
{
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
if(irq < 8) {
if(m_irq_mask & (1<<irq)){
@@ -163,7 +163,7 @@
outb(0x60+(irq-8),I8259_S_CR); /* EOI */
outb(0x60+2,I8259_M_CR);
}
- restore_flags(flags);
+ local_irq_restore(flags);
}
static void end_mpc1211_irq(unsigned int irq)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-01-05 1:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-05 1:10 [PATCH] sh: remove cli()/sti() in arch/sh/boards/mpc1211/setup.c James Nelson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®