summaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorAlex Porosanu <alexandru.porosanu@freescale.com>2014-02-03 13:04:56 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2014-02-26 16:15:27 (GMT)
commit3e5def8d2240edcd7712cee845419e1282bc6c75 (patch)
treef83f90008ab220bad11fca49df67aff3839c4763 /arch/powerpc/include
parentfd24b82e167e41329436dc4d1f07284bb348887d (diff)
downloadlinux-fsl-qoriq-3e5def8d2240edcd7712cee845419e1282bc6c75.tar.xz
powerpc/irq: fix compilation error if CONFIG_TRACE_IRQFLAGS is enabled
If CONFIG_TRACE_IRQFLAGS is set to 'y' in the kernel configuration file, then compilation will fail with the following error message: CC arch/powerpc/kernel/irq.o arch/powerpc/kernel/irq.c: In function 'arch_local_irq_restore': arch/powerpc/kernel/irq.c:233:2: error: 'else' without a previous 'if' make[1]: *** [arch/powerpc/kernel/irq.o] Error 1 make: *** [arch/powerpc/kernel] Error 2 This is due to the fact that the __hard_irq_disable() macro used if erratum A006198 is not enabled has a trailing semicolon. This leads to having two statements instead of one in arch/powerpc/kernel/irq.c: ... if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) __hard_irq_disable(); else { ... The 2nd semicolon (coming from the code above) signals the end of the braceless "if", which leaves the subsequent "else" without a corresponding "if", which is exactly what the compiler complains about. This patch removes the trailing semicolon from the __hard_irq_disable() macro. Change-Id: If223ee6f85f3f0e0bd0883ccf3ea95768cb6e69e Signed-off-by: Alex Porosanu <alexandru.porosanu@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/8547 Reviewed-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com> Tested-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/hw_irq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 5c5607b..39d335b 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -111,7 +111,7 @@ static inline void __hard_irq_disable(void)
"memory", "lr");
}
#else
-#define __hard_irq_disable() asm volatile("wrteei 0" : : : "memory");
+#define __hard_irq_disable() asm volatile("wrteei 0" : : : "memory")
#endif
#else