Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b2de34 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Fix build of some debug irq code 



There was a typo, checking for CONFIG_TRACE_IRQFLAG instead of
CONFIG_TRACE_IRQFLAGS causing some useful debug code to not be
built

This in turns causes a build error on BookE 64-bit due to incorrect
semicolons at the end of a couple of macros, so let's fix that too

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
CC: stable@vger.kernel.org [v3.4]
parent be2cf20a

arch/powerpc/include/asm/hw_irq.h

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static inline bool arch_irqs_disabled(void) 
}



#ifdef CONFIG_PPC_BOOK3E

#define __hard_irq_enable()	asm volatile("wrteei 1" : : : "memory");

#define __hard_irq_disable()	asm volatile("wrteei 0" : : : "memory");

#define __hard_irq_enable()	asm volatile("wrteei 1" : : : "memory")

#define __hard_irq_disable()	asm volatile("wrteei 0" : : : "memory")

#else

#define __hard_irq_enable()	__mtmsrd(local_paca->kernel_msr | MSR_EE, 1)

#define __hard_irq_disable()	__mtmsrd(local_paca->kernel_msr, 1)

arch/powerpc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ notrace void arch_local_irq_restore(unsigned long en) 
	 */

	if (unlikely(irq_happened != PACA_IRQ_HARD_DIS))

		__hard_irq_disable();

#ifdef CONFIG_TRACE_IRQFLAG

#ifdef CONFIG_TRACE_IRQFLAGS

	else {

		/*

		 * We should already be hard disabled here. We had bugs