[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20121001225157.738708230@1wt.eu>
Date: Tue, 02 Oct 2012 00:52:00 +0200
From: Willy Tarreau <w@....eu>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Jeremy Kerr <jeremy.kerr@...onical.com>,
Willy Tarreau <w@....eu>
Subject: [ 003/180] powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Herrenschmidt <benh@...nel.crashing.org>
commit 78c5c68a4cf4329d17abfa469345ddf323d4fd62 upstream.
The code for "powersurge" SMP would kick in and cause a crash
at boot due to the lack of a NULL test.
Adam Conrad reports that the 3.2 kernel, with CONFIG_SMP=y, will not
boot on an OldWorld G3; we're unconditionally writing to psurge_start,
but this is only set on powersurge machines.
Signed-off-by: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Signed-off-by: Jeremy Kerr <jeremy.kerr@...onical.com>
Reported-by: Adam Conrad <adconrad@...ntu.com>
Tested-by: Adam Conrad <adconrad@...ntu.com>
Signed-off-by: Willy Tarreau <w@....eu>
---
arch/powerpc/platforms/powermac/smp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index b40c22d..7f66d0c 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -402,7 +402,7 @@ static struct irqaction psurge_irqaction = {
static void __init smp_psurge_setup_cpu(int cpu_nr)
{
- if (cpu_nr != 0)
+ if (cpu_nr != 0 || !psurge_start)
return;
/* reset the entry point so if we get another intr we won't
--
1.7.2.1.45.g54fbc
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists