path: root/arch/sparc/prom
diff options
authorDavid Howells <>2010-10-07 14:08:55 +0100
committerDavid Howells <>2010-10-07 14:08:55 +0100
commitdf9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 (patch)
tree0c9a87ef1ea042c4432f122c3d03614d21156fc1 /arch/sparc/prom
parentca4d3e6746bdcfccb517349bce2d2c5b5614fb6f (diff)
Fix IRQ flag handling naming
Fix the IRQ flag handling naming. In linux/irqflags.h under one configuration, it maps: local_irq_enable() -> raw_local_irq_enable() local_irq_disable() -> raw_local_irq_disable() local_irq_save() -> raw_local_irq_save() ... and under the other configuration, it maps: raw_local_irq_enable() -> local_irq_enable() raw_local_irq_disable() -> local_irq_disable() raw_local_irq_save() -> local_irq_save() ... This is quite confusing. There should be one set of names expected of the arch, and this should be wrapped to give another set of names that are expected by users of this facility. Change this to have the arch provide: flags = arch_local_save_flags() flags = arch_local_irq_save() arch_local_irq_restore(flags) arch_local_irq_disable() arch_local_irq_enable() arch_irqs_disabled_flags(flags) arch_irqs_disabled() arch_safe_halt() Then linux/irqflags.h wraps these to provide: raw_local_save_flags(flags) raw_local_irq_save(flags) raw_local_irq_restore(flags) raw_local_irq_disable() raw_local_irq_enable() raw_irqs_disabled_flags(flags) raw_irqs_disabled() raw_safe_halt() with type checking on the flags 'arguments', and then wraps those to provide: local_save_flags(flags) local_irq_save(flags) local_irq_restore(flags) local_irq_disable() local_irq_enable() irqs_disabled_flags(flags) irqs_disabled() safe_halt() with tracing included if enabled. The arch functions can now all be inline functions rather than some of them having to be macros. Signed-off-by: David Howells <> [X86, FRV, MN10300] Signed-off-by: Chris Metcalf <> [Tile] Signed-off-by: Michal Simek <> [Microblaze] Tested-by: Catalin Marinas <> [ARM] Acked-by: Thomas Gleixner <> Acked-by: Haavard Skinnemoen <> [AVR] Acked-by: Tony Luck <> [IA-64] Acked-by: Hirokazu Takata <> [M32R] Acked-by: Greg Ungerer <> [M68K/M68KNOMMU] Acked-by: Ralf Baechle <> [MIPS] Acked-by: Kyle McMartin <> [PA-RISC] Acked-by: Paul Mackerras <> [PowerPC] Acked-by: Martin Schwidefsky <> [S390] Acked-by: Chen Liqin <> [Score] Acked-by: Matt Fleming <> [SH] Acked-by: David S. Miller <> [Sparc] Acked-by: Chris Zankel <> [Xtensa] Reviewed-by: Richard Henderson <> [Alpha] Reviewed-by: Yoshinori Sato <> [H8300] Cc: [CRIS] Cc: [CRIS] Cc:
Diffstat (limited to 'arch/sparc/prom')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/prom/p1275.c b/arch/sparc/prom/p1275.c
index fa6e4e219b9c..d9850c2b9bf2 100644
--- a/arch/sparc/prom/p1275.c
+++ b/arch/sparc/prom/p1275.c
@@ -39,7 +39,7 @@ void p1275_cmd_direct(unsigned long *args)
unsigned long flags;
- raw_local_irq_restore(PIL_NMI);
+ raw_local_irq_restore((unsigned long)PIL_NMI);