Prev: Documentation/development-process: add info on maintainers
Next: Allow CONFIG_MIGRATION to be set without CONFIG_NUMA or memory hot-remove
From: David Miller on 6 Apr 2010 19:50 It disables up to PIL_NMI instead of just PIL_NORMAL_MAX. Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h index 8b49bf9..fa1e00e 100644 --- a/arch/sparc/include/asm/irqflags_64.h +++ b/arch/sparc/include/asm/irqflags_64.h @@ -49,6 +49,16 @@ static inline void raw_local_irq_disable(void) ); } +static inline void raw_local_irq_disable_nmi(void) +{ + __asm__ __volatile__( + "wrpr %0, %%pil" + : /* no outputs */ + : "i" (PIL_NMI) + : "memory" + ); +} + static inline void raw_local_irq_enable(void) { __asm__ __volatile__( @@ -83,9 +93,28 @@ static inline unsigned long __raw_local_irq_save(void) return flags; } +static inline unsigned long __raw_local_irq_save_nmi(void) +{ + unsigned long flags = __raw_local_save_flags(); + + raw_local_irq_disable_nmi(); + + return flags; +} + #define raw_local_irq_save(flags) \ do { (flags) = __raw_local_irq_save(); } while (0) +#define raw_local_irq_save_nmi(flags) \ + do { (flags) = __raw_local_irq_save_nmi(); } while (0) + +#define local_irq_save_nmi(flags) \ + do { \ + typecheck(unsigned long, flags); \ + raw_local_irq_save_nmi(flags); \ + trace_hardirqs_off(); \ + } while (0) + #endif /* (__ASSEMBLY__) */ #endif /* !(_ASM_IRQFLAGS_H) */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |