---

yaml --- r: 136513 b: refs/heads/master c: 22f2513 h: refs/heads/master i: 136511: 2fd6adc v: v3
git-mirror · Jan 27, 2009 · 14a88ed · 14a88ed
1 parent e989617
commit 14a88ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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