@@ -93,11 +93,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)
@@ -107,7 +102,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)
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 <maddy@linux.vnet.ibm.com> --- arch/powerpc/include/asm/hw_irq.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)