diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 04:16:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 04:16:17 +0100 |
| commit | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (patch) | |
| tree | cd938308f7a151bf294a2af26019c73218225c9f /init/main.c | |
| parent | [PATCH] Creative Audigy 2 cardbus: Add IO window wakeup magic (diff) | |
| download | linux-1e4c85f97fe26fbd70da12148b3992c0e00361fd.tar.xz linux-1e4c85f97fe26fbd70da12148b3992c0e00361fd.zip | |
Revert "i386: move apic init in init_IRQs"
Commit f2b36db692b7ff6972320ad9839ae656a3b0ee3e causes a bootup hang on
at least one machine. Revert for now until we understand why. The old
code may be ugly, but it works.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | init/main.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 4075d97e94b1..f142d4035341 100644 --- a/init/main.c +++ b/init/main.c @@ -64,6 +64,10 @@ #endif #endif +#ifdef CONFIG_X86_LOCAL_APIC +#include <asm/smp.h> +#endif + /* * Versions of gcc older than that listed below may actually compile * and link okay, but the end product can have subtle run time bugs. @@ -310,7 +314,14 @@ extern void setup_arch(char **); #ifndef CONFIG_SMP +#ifdef CONFIG_X86_LOCAL_APIC +static void __init smp_init(void) +{ + APIC_init_uniprocessor(); +} +#else #define smp_init() do { } while (0) +#endif static inline void setup_per_cpu_areas(void) { } static inline void smp_prepare_cpus(unsigned int maxcpus) { } |