diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /init | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'init')
| -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 3d3e67aa1..3afae2ad4 100644 --- a/init/main.c +++ b/init/main.c @@ -61,6 +61,10 @@ extern void nubus_init(void); #include <net/irda/irda_device.h> #endif +#ifdef CONFIG_X86_IO_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. @@ -435,7 +439,14 @@ extern void cpu_idle(void); #ifndef __SMP__ +#ifdef CONFIG_X86_IO_APIC +static void __init smp_init(void) +{ + IO_APIC_init_uniprocessor(); +} +#else #define smp_init() do { } while (0) +#endif #else |