From: David Gibson <david@gibson.dropbear.id.au>
Date: Fri, 21 Oct 2005 05:43:42 +0000 (+1000)
Subject: [PATCH] Fix broken initialization of conswitchp for ARCH=ppc64
X-Git-Tag: v2.6.15-rc1~59^2~130
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0faa28493f97b55b36ff5b1a2b8c81bf253a460;p=linux-2.6

[PATCH] Fix broken initialization of conswitchp for ARCH=ppc64

In the merge tree, commit 0458060c1c59c5378d8fb5daabe18cf4681c35cd
broke boot on some machines because the initialization of conswitchp
was moved to arch/powerpc/kernel/setup_64.c, but a corresponding copy
was not added to arch/ppc64/kernel/setup.c.  This patch fixes it.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index 42019be0c6..b7885028fc 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -1039,6 +1039,10 @@ void __init setup_arch(char **cmdline_p)
 	/* initialize the syscall map in systemcfg */
 	setup_syscall_map();
 
+#ifdef CONFIG_DUMMY_CONSOLE
+	conswitchp = &dummy_con;
+#endif
+
 	ppc_md.setup_arch();
 
 	/* Use the default idle loop if the platform hasn't provided one. */