Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 892ee2e5ecbce417df506715f7b28d28c403ef91..5ed24ea0e9455558931a414a38045cac44edb2ae 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -155,6 +155,8 @@ static void smp_callin(void)
         */
        phys_id = read_apic_id();
 
+       set_numa_mem(local_memory_node(cpu_to_node(cpuid)));
+
        /*
         * the boot CPU has finished the init stage and is spinning
         * on callin_map until we finish. We are free to set up this