1 files changed, 7 insertions, 6 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 407efea04bf5..9e392a30d197 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -60,6 +60,7 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
+#include <asm/hpsim.h>
 
 #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
 # error "struct cpuinfo_ia64 too big!"
@@ -389,13 +390,8 @@ early_console_setup (char *cmdline)
         if (!efi_setup_pcdp_console(cmdline))
                 earlycons++;
 #endif
-#ifdef CONFIG_HP_SIMSERIAL_CONSOLE
-        {
-                extern struct console hpsim_cons;
-                register_console(&hpsim_cons);
+        if (!simcons_register())
                 earlycons++;
-        }
-#endif
 
         return (earlycons) ? 0 : -1;
 }
@@ -960,6 +956,11 @@ cpu_init (void)
 
         /* clear TPR & XTP to enable all interrupt classes: */
         ia64_setreg(_IA64_REG_CR_TPR, 0);
+
+        /* Clear any pending interrupts left by SAL/EFI */
+        while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR)
+                ia64_eoi();
+
 #ifdef CONFIG_SMP
         normal_xtp();
 #endif