diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-15 23:28:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-15 23:28:41 -0800 |
| commit | 01ef13d0f7de81626f6d1efb60579bf810d4b479 (patch) | |
| tree | 7ba8924207dff6d5e74d3229232e5d58bc02f896 | |
| parent | c40a48a4a9aff3f3bd2843923df9cfd5f6303c2e (diff) | |
| parent | 0d6e2523de11f60bac71296ec8a9ddabb7667550 (diff) | |
Merge bk://cifs.bkbits.net/linux-2.5cifs
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | arch/ia64/kernel/setup.c | 16 | ||||
| -rw-r--r-- | include/asm-ia64/delay.h | 2 |
2 files changed, 12 insertions, 6 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 */ diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h index aa627cfd88f5..57182d6f2b9a 100644 --- a/include/asm-ia64/delay.h +++ b/include/asm-ia64/delay.h @@ -91,7 +91,7 @@ udelay (unsigned long usecs) unsigned long cycles = usecs*local_cpu_data->cyc_per_usec; while (ia64_get_itc() - start < cycles) - /* skip */; + cpu_relax(); } #endif /* _ASM_IA64_DELAY_H */ |