summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mosberger <davidm@hpl.hp.com>2004-12-15 21:32:09 -0800
committerTony Luck <tony.luck@intel.com>2004-12-15 21:32:09 -0800
commit0d6e2523de11f60bac71296ec8a9ddabb7667550 (patch)
treeeef451cbff1a4a358661e8b8f6e13e8fafb4378e
parent4a179a4674653175919df2b15edbe79f0d022758 (diff)
[IA64] do early_console_setup() on UP, too
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>
-rw-r--r--arch/ia64/kernel/setup.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index d54628de4970..7b2033bf0954 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -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 */