aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/setup.c
diff options
context:
space:
mode:
authorPeter Chubb <peterc@chubb.wattle.id.au>2007-08-20 23:51:45 -0400
committerTony Luck <tony.luck@intel.com>2007-09-01 05:50:39 -0400
commit8b713c67bccef7cabb0ee915f47eb33d82636af9 (patch)
tree73a0577c8dd70825eaa41dc4527ab09432418166 /arch/ia64/kernel/setup.c
parent99a19cf1c0eb22bad83fff060f08330ee9e029e2 (diff)
[IA64] Enable early console for Ski simulator
This patch cleans up the `enable early console for SKI' patch (471e7a44848f467c9b83adc3463d019d2fa8817f), and 1. potentially allows the gensparse_defconfig to work again. (there are other problems running a generic kernel on Ski) 2. fixes the `console registered twice' problem. 3. Cleans up the code by moving the `extern hpsim_cons' declaration to a new asm/hpsim.h file. Thanks to Jes for comments. Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r--arch/ia64/kernel/setup.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 1f9b1d818dcd..9e392a30d197 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -60,6 +60,7 @@
60#include <asm/smp.h> 60#include <asm/smp.h>
61#include <asm/system.h> 61#include <asm/system.h>
62#include <asm/unistd.h> 62#include <asm/unistd.h>
63#include <asm/hpsim.h>
63 64
64#if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) 65#if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
65# error "struct cpuinfo_ia64 too big!" 66# error "struct cpuinfo_ia64 too big!"
@@ -389,13 +390,8 @@ early_console_setup (char *cmdline)
389 if (!efi_setup_pcdp_console(cmdline)) 390 if (!efi_setup_pcdp_console(cmdline))
390 earlycons++; 391 earlycons++;
391#endif 392#endif
392#ifdef CONFIG_HP_SIMSERIAL_CONSOLE 393 if (!simcons_register())
393 {
394 extern struct console hpsim_cons;
395 register_console(&hpsim_cons);
396 earlycons++; 394 earlycons++;
397 }
398#endif
399 395
400 return (earlycons) ? 0 : -1; 396 return (earlycons) ? 0 : -1;
401} 397}