Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes

[firefly-linux-kernel-4.4.55.git] / arch / ia64 / sn / kernel / setup.c

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 36182c84363ce914d15f34a5be72afdc6f580b46..5f6b6b48c1d58567b21ba3680969fb53f52195fa 100644 (file)
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -629,7 +629,7 @@ void sn_cpu_init(void)
 
        cnode = nasid_to_cnodeid(nasid);
 
-       sn_nodepda = nodepdaindr[cnode];
+       __this_cpu_write(__sn_nodepda, nodepdaindr[cnode]);
 
        pda->led_address =
            (typeof(pda->led_address)) (LED0 + (slice << LED_CPU_SHIFT));