2 files changed, 8 insertions, 2 deletions

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index e2beb4cba15f..529e45c37b1c 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -65,6 +65,7 @@
 #include <asm/cacheflush.h>
 #include <asm/mce.h>
 #include <asm/ds.h>
+#include <asm/topology.h>
 
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
@@ -359,8 +360,9 @@ void __init setup_arch(char **cmdline_p)
         io_delay_init();
 
 #ifdef CONFIG_SMP
-        /* setup to use the static apicid table during kernel startup */
+        /* setup to use the early static init tables during kernel startup */
         x86_cpu_to_apicid_early_ptr = (void *)&x86_cpu_to_apicid_init;
+        x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
 #endif
 
 #ifdef CONFIG_ACPI
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index a2076b5f12af..a8bc2bcdb74a 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -861,9 +861,12 @@ void __init smp_set_apicids(void)
         int cpu;
 
         for_each_possible_cpu(cpu) {
-                if (per_cpu_offset(cpu))
+                if (per_cpu_offset(cpu)) {
                         per_cpu(x86_cpu_to_apicid, cpu) =
                                                 x86_cpu_to_apicid_init[cpu];
+                        per_cpu(x86_cpu_to_node_map, cpu) =
+                                                x86_cpu_to_node_map_init[cpu];
+                }
                 else
                         printk(KERN_NOTICE "per_cpu_offset zero for cpu %d\n",
                                                                         cpu);
@@ -871,6 +874,7 @@ void __init smp_set_apicids(void)
 
         /* indicate the early static arrays are gone */
         x86_cpu_to_apicid_early_ptr = NULL;
+        x86_cpu_to_node_map_early_ptr = NULL;
 }
 
 static void __init smp_cpu_index_default(void)