[PATCH v10 07/17] powerpc/64: Implement and use soft_enabled_set_return API

[Madhavan Srinivasan]

Add a new wrapper function, soft_enabled_set_return(), added to do the
paca->soft_enabled updates requiring a set-return.

Signed-off-by: Madhavan Srinivasan <ma...@linux.vnet.ibm.com>
---
 arch/powerpc/include/asm/hw_irq.h | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/include/asm/hw_irq.h 
b/arch/powerpc/include/asm/hw_irq.h
index fbffeecb913f..8b1476609ba7 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -76,6 +76,20 @@ static inline notrace void soft_enabled_set(unsigned long 
enable)
                : "memory");
 }
 
+static inline notrace unsigned long soft_enabled_set_return(unsigned long 
enable)
+{
+       unsigned long flags;
+
+       asm volatile(
+               "lbz %0,%1(13); stb %2,%1(13)"
+               : "=&r" (flags)
+               : "i" (offsetof(struct paca_struct, soft_enabled)),
+                 "r" (enable)
+               : "memory");
+
+       return flags;
+}
+
 static inline unsigned long arch_local_save_flags(void)
 {
        return soft_enabled_return();
@@ -95,16 +109,7 @@ static inline void arch_local_irq_enable(void)
 
 static inline unsigned long arch_local_irq_save(void)
 {
-       unsigned long flags;
-
-       asm volatile(
-               "lbz %0,%1(13); stb %2,%1(13)"
-               : "=&r" (flags)
-               : "i" (offsetof(struct paca_struct, soft_enabled)),
-                 "r" (IRQ_DISABLED)
-               : "memory");
-
-       return flags;
+       return soft_enabled_set_return(IRQ_DISABLED);
 }
 
 static inline bool arch_irqs_disabled_flags(unsigned long flags)
-- 
2.7.4