]> git.neil.brown.name Git - history.git/commitdiff
[IA64] do early_console_setup() on UP, too
authorDavid Mosberger <davidm@hpl.hp.com>
Thu, 16 Dec 2004 05:32:09 +0000 (21:32 -0800)
committerTony Luck <tony.luck@intel.com>
Thu, 16 Dec 2004 05:32:09 +0000 (21:32 -0800)
Here is trivial patch to enable the early console setup for UP as well.
Tested on zx1.

Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/setup.c

index d54628de4970e5de780e414195b4e69aac1b1106..7b2033bf09546b542626d39f63ce647a90bfccf0 100644 (file)
@@ -289,6 +289,15 @@ early_console_setup (char *cmdline)
        return -1;
 }
 
+static inline void
+mark_bsp_online (void)
+{
+#ifdef CONFIG_SMP
+       /* If we register an early console, allow CPU 0 to printk */
+       cpu_set(smp_processor_id(), cpu_online_map);
+#endif
+}
+
 void __init
 setup_arch (char **cmdline_p)
 {
@@ -306,11 +315,8 @@ setup_arch (char **cmdline_p)
        machvec_init(acpi_get_sysname());
 #endif
 
-#ifdef CONFIG_SMP
-       /* If we register an early console, allow CPU 0 to printk */
-       if (!early_console_setup(*cmdline_p))
-               cpu_set(smp_processor_id(), cpu_online_map);
-#endif
+       if (early_console_setup(*cmdline_p) == 0)
+               mark_bsp_online();
 
 #ifdef CONFIG_ACPI_BOOT
        /* Initialize the ACPI boot-time table parser */