[PATCH v10 06/14] powerpc/irq: Fix arch_local_irq_disable() in book3s
flat view
STALE3335d
From: Madhavan Srinivasan <hidden>
Date: 2017-08-20 17:59:25
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
In powerpc book3s, arch_local_irq_disable() function is not a "void" when compared to other arch. And only user for this function is arch_local_irq_save(). Patch modify the arch_local_irq_save() and makes arch_local_irq_disable() to use arch_local_irq_save() instead. Suggested-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Madhavan Srinivasan <redacted> --- arch/powerpc/include/asm/hw_irq.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index d1ddb74fe837..85f67a4938a5 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h@@ -90,11 +90,6 @@ static inline unsigned long arch_local_save_flags(void) return soft_enabled_return(); } -static inline unsigned long arch_local_irq_disable(void) -{ - return soft_enabled_set_return(IRQ_DISABLED); -} - extern void arch_local_irq_restore(unsigned long); static inline void arch_local_irq_enable(void)
@@ -104,7 +99,12 @@ static inline void arch_local_irq_enable(void) static inline unsigned long arch_local_irq_save(void) { - return arch_local_irq_disable(); + return soft_enabled_set_return(IRQ_DISABLED); +} + +static inline void arch_local_irq_disable(void) +{ + arch_local_irq_save(); } static inline bool arch_irqs_disabled_flags(unsigned long flags)
--
2.7.4