diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-01 09:02:10 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-01 09:02:10 -0800 |
| commit | ef0eaa13362041f531f951b89362bfbc177e2bc0 (patch) | |
| tree | e2d43099698aa238f9d108c67451871b0d4073f9 /init/main.c | |
| parent | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
| download | linux-rt-ef0eaa13362041f531f951b89362bfbc177e2bc0.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 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) { } |