diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-01-27 14:21:37 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-27 14:21:37 +0900 |
| commit | 22f25138c345ec46a13744c93c093ff822cd98d1 (patch) | |
| tree | a922020043da1a59d4bfcc7da32a40ad0662fdb4 /arch/x86/kernel | |
| parent | 2697fbd5faf19c84c17441b1752bdcbdcfd1248c (diff) | |
x86: fix build breakage on voyage
Impact: build fix
x86_cpu_to_apicid and x86_bios_cpu_apicid aren't defined for voyage.
Earlier patch forgot to conditionalize early percpu clearing. Fix it.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 4caa78d7cb1..c7458ead22d 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -125,8 +125,10 @@ void __init setup_per_cpu_areas(void) } /* indicate the early static arrays will soon be gone */ +#ifdef CONFIG_X86_LOCAL_APIC early_per_cpu_ptr(x86_cpu_to_apicid) = NULL; early_per_cpu_ptr(x86_bios_cpu_apicid) = NULL; +#endif #if defined(CONFIG_X86_64) && defined(CONFIG_NUMA) early_per_cpu_ptr(x86_cpu_to_node_map) = NULL; #endif |