This is a note to let you know that I've just added the patch titled
powerpc: Fix build of some debug irq code
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
powerpc-fix-build-of-some-debug-irq-code.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 21b2de341270bd7bb7a811027ffe63276d9b3b75 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <[email protected]>
Date: Tue, 10 Jul 2012 18:37:56 +1000
Subject: powerpc: Fix build of some debug irq code
From: Benjamin Herrenschmidt <[email protected]>
commit 21b2de341270bd7bb7a811027ffe63276d9b3b75 upstream.
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: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/powerpc/include/asm/hw_irq.h | 4 ++--
arch/powerpc/kernel/irq.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -85,8 +85,8 @@ static inline bool arch_irqs_disabled(vo
}
#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)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -229,7 +229,7 @@ notrace void arch_local_irq_restore(unsi
*/
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
Patches currently in stable-queue which might be from [email protected]
are
queue-3.4/powerpc-more-fixes-for-lazy-irq-vs.-idle.patch
queue-3.4/powerpc-kvm-sldi-should-be-sld.patch
queue-3.4/powerpc-fix-uninitialised-error-in-numa.c.patch
queue-3.4/powerpc-ftrace-do-not-trace-restore_interrupts.patch
queue-3.4/powerpc-fix-build-of-some-debug-irq-code.patch
queue-3.4/powerpc-pseries-fix-software-invalidate-tce.patch
queue-3.4/powerpc-xmon-use-cpumask-iterator-to-avoid-warning.patch
queue-3.4/powerpc-check_and_cede_processor-never-cedes.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
