Commit 8a8d20f5 authored by David Mosberger's avatar David Mosberger

ia64: Fix UP-build breakage caused by early_console_setup() patch.

parent e8253652
...@@ -289,7 +289,7 @@ setup_serial_legacy (void) ...@@ -289,7 +289,7 @@ setup_serial_legacy (void)
* *
* Returns non-zero if a console couldn't be setup. * Returns non-zero if a console couldn't be setup.
*/ */
static int __init static inline int __init
early_console_setup (void) early_console_setup (void)
{ {
#ifdef CONFIG_SERIAL_SGI_L1_CONSOLE #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
...@@ -320,9 +320,11 @@ setup_arch (char **cmdline_p) ...@@ -320,9 +320,11 @@ setup_arch (char **cmdline_p)
machvec_init(acpi_get_sysname()); machvec_init(acpi_get_sysname());
#endif #endif
#ifdef CONFIG_SMP
/* If we register an early console, allow CPU 0 to printk */ /* If we register an early console, allow CPU 0 to printk */
if (!early_console_setup()) if (!early_console_setup())
cpu_set(smp_processor_id(), cpu_online_map); cpu_set(smp_processor_id(), cpu_online_map);
#endif
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI_BOOT
/* Initialize the ACPI boot-time table parser */ /* Initialize the ACPI boot-time table parser */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment