From 14a88edf0d37f073f8dd1a3063b794974f215d48 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Tue, 27 Jan 2009 14:21:37 +0900 Subject: [PATCH] --- yaml --- r: 136513 b: refs/heads/master c: 22f25138c345ec46a13744c93c093ff822cd98d1 h: refs/heads/master i: 136511: 2fd6adc675bed7cc411e424c6c8a02b7a354bc38 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_percpu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab40b1e52f83..a983a27ff820 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2697fbd5faf19c84c17441b1752bdcbdcfd1248c +refs/heads/master: 22f25138c345ec46a13744c93c093ff822cd98d1 diff --git a/trunk/arch/x86/kernel/setup_percpu.c b/trunk/arch/x86/kernel/setup_percpu.c index 4caa78d7cb15..c7458ead22de 100644 --- a/trunk/arch/x86/kernel/setup_percpu.c +++ b/trunk/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