diff options
| author | Mike Travis <travis@sgi.com> | 2008-01-30 07:33:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:32 -0500 |
| commit | dd5af90a7f3d79e04b7eace9a98644dbf2038f4d (patch) | |
| tree | 22327ba385c830b7be391c76821dc5ec26863f2e /init/main.c | |
| parent | 3212bff370c2f22e4987c6679ba485654cefb178 (diff) | |
x86/non-x86: percpu, node ids, apic ids x86.git fixup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 5843fe996703..3316dffe3e57 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -363,7 +363,7 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { } | |||
| 363 | 363 | ||
| 364 | #else | 364 | #else |
| 365 | 365 | ||
| 366 | #ifndef CONFIG_ARCH_SETS_UP_PER_CPU_AREA | 366 | #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA |
| 367 | unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; | 367 | unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; |
| 368 | 368 | ||
| 369 | EXPORT_SYMBOL(__per_cpu_offset); | 369 | EXPORT_SYMBOL(__per_cpu_offset); |
| @@ -384,7 +384,7 @@ static void __init setup_per_cpu_areas(void) | |||
| 384 | ptr += size; | 384 | ptr += size; |
| 385 | } | 385 | } |
| 386 | } | 386 | } |
| 387 | #endif /* CONFIG_ARCH_SETS_UP_CPU_AREA */ | 387 | #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */ |
| 388 | 388 | ||
| 389 | /* Called by boot processor to activate the rest. */ | 389 | /* Called by boot processor to activate the rest. */ |
| 390 | static void __init smp_init(void) | 390 | static void __init smp_init(void) |