[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 42019be0c6add9641ffcf06d7afe224df0a47f67..b7885028fcf1ac8b089c1b7b4d85d650b9085ea4 100644 (file)
--- 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. */