Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / cpu / common.c

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index da8f15ac7a6d3853efae3285f22874af22131238..b9c9ea0217a9b1fd4581f27fed692aaa6fe167ee 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -20,6 +20,7 @@
 #include <asm/pat.h>
 #include <asm/asm.h>
 #include <asm/numa.h>
+#include <asm/smp.h>
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
@@ -550,7 +551,9 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
 
        validate_pat_support(c);
 
+#ifdef CONFIG_SMP
        c->cpu_index = boot_cpu_id;
+#endif
 }
 
 void __init early_cpu_init(void)