1 files changed, 5 insertions, 1 deletions

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)