diff options
| author |   David Gibson <david@gibson.dropbear.id.au> | 2005-10-21 15:43:42 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-10-21 22:47:09 +1000 |
| commit | b0faa28493f97b55b36ff5b1a2b8c81bf253a460 (patch) | |
| tree | c7735210c0de8f21bc91e5ef19b5ba930411a2c4 | |
| parent | powerpc: Fix some bugs in the new merged time code (diff) | |
| download | linux-dev-b0faa28493f97b55b36ff5b1a2b8c81bf253a460.tar.xz linux-dev-b0faa28493f97b55b36ff5b1a2b8c81bf253a460.zip | |
[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>
| -rw-r--r-- | arch/ppc64/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 42019be0c6ad..b7885028fcf1 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. */ |