diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 15:51:32 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 15:51:32 +0000 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /init/main.c | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'init/main.c')
| -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 4075d97e94b..f142d403534 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) { } |