Commit ae7aa7fd authored by David S. Miller's avatar David S. Miller

include/asm-sparc64/auxio.h: Use local_irq_{save,restore}.

parent fb2707d2
...@@ -80,14 +80,13 @@ do { if (AUXREG) \ ...@@ -80,14 +80,13 @@ do { if (AUXREG) \
} while(0) } while(0)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern __inline__ void set_auxio(unsigned char bits_on, unsigned char bits_off) static __inline__ void set_auxio(unsigned char bits_on, unsigned char bits_off)
{ {
unsigned char regval; unsigned char regval;
unsigned long flags; unsigned long flags;
save_flags(flags); cli(); local_irq_save(flags);
if (AUXREG) {
if(AUXREG) {
unsigned char newval; unsigned char newval;
regval = sbus_readb(AUXREG); regval = sbus_readb(AUXREG);
...@@ -96,7 +95,7 @@ extern __inline__ void set_auxio(unsigned char bits_on, unsigned char bits_off) ...@@ -96,7 +95,7 @@ extern __inline__ void set_auxio(unsigned char bits_on, unsigned char bits_off)
newval |= AUXIO_ORMEIN4M; newval |= AUXIO_ORMEIN4M;
sbus_writeb(newval, AUXREG); sbus_writeb(newval, AUXREG);
} }
restore_flags(flags); local_irq_restore(flags);
} }
#endif /* !(__ASSEMBLY__) */ #endif /* !(__ASSEMBLY__) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment