瀏覽代碼

powerpc/64: Cleanup hard_irq_disable() macro

Minor cleanup to use helper function for manipulating
paca->soft_enabled variable.

Suggested-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Madhavan Srinivasan 7 年之前
父節點
當前提交
acb396d7c2
共有 1 個文件被更改,包括 3 次插入4 次删除
  1. 3 4
      arch/powerpc/include/asm/hw_irq.h

+ 3 - 4
arch/powerpc/include/asm/hw_irq.h

@@ -131,12 +131,11 @@ static inline bool arch_irqs_disabled(void)
 #endif
 #endif
 
 
 #define hard_irq_disable()	do {			\
 #define hard_irq_disable()	do {			\
-	u8 _was_enabled;				\
+	unsigned long flags;				\
 	__hard_irq_disable();				\
 	__hard_irq_disable();				\
-	_was_enabled = local_paca->soft_enabled;	\
-	local_paca->soft_enabled = IRQS_DISABLED;\
+	flags = soft_enabled_set_return(IRQS_DISABLED);	\
 	local_paca->irq_happened |= PACA_IRQ_HARD_DIS;	\
 	local_paca->irq_happened |= PACA_IRQ_HARD_DIS;	\
-	if (_was_enabled == IRQS_ENABLED)	\
+	if (!arch_irqs_disabled_flags(flags))		\
 		trace_hardirqs_off();			\
 		trace_hardirqs_off();			\
 } while(0)
 } while(0)