Commit b0faa284 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras

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

In the merge tree, commit 0458060c
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: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5d14a18d
...@@ -1039,6 +1039,10 @@ void __init setup_arch(char **cmdline_p) ...@@ -1039,6 +1039,10 @@ void __init setup_arch(char **cmdline_p)
/* initialize the syscall map in systemcfg */ /* initialize the syscall map in systemcfg */
setup_syscall_map(); setup_syscall_map();
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#endif
ppc_md.setup_arch(); ppc_md.setup_arch();
/* Use the default idle loop if the platform hasn't provided one. */ /* Use the default idle loop if the platform hasn't provided one. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment