1 files changed, 8 insertions, 8 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index db7b36bb068b..8bfd36af46f8 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1341,7 +1341,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
                 ia64_mlogbuf_finish(1);
         }
 
-        if (__get_cpu_var(ia64_mca_tr_reload)) {
+        if (__this_cpu_read(ia64_mca_tr_reload)) {
                 mca_insert_tr(0x1); /*Reload dynamic itrs*/
                 mca_insert_tr(0x2); /*Reload dynamic itrs*/
         }
@@ -1868,14 +1868,14 @@ ia64_mca_cpu_init(void *cpu_data)
                 "MCA", cpu);
         format_mca_init_stack(data, offsetof(struct ia64_mca_cpu, init_stack),
                 "INIT", cpu);
-        __get_cpu_var(ia64_mca_data) = __per_cpu_mca[cpu] = __pa(data);
+        __this_cpu_write(ia64_mca_data, (__per_cpu_mca[cpu] = __pa(data)));
 
         /*
          * Stash away a copy of the PTE needed to map the per-CPU page.
          * We may need it during MCA recovery.
          */
-        __get_cpu_var(ia64_mca_per_cpu_pte) =
-                pte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL));
+        __this_cpu_write(ia64_mca_per_cpu_pte,
+                pte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL)));
 
         /*
          * Also, stash away a copy of the PAL address and the PTE
@@ -1884,10 +1884,10 @@ ia64_mca_cpu_init(void *cpu_data)
         pal_vaddr = efi_get_pal_addr();
         if (!pal_vaddr)
                 return;
-        __get_cpu_var(ia64_mca_pal_base) =
-                GRANULEROUNDDOWN((unsigned long) pal_vaddr);
-        __get_cpu_var(ia64_mca_pal_pte) = pte_val(mk_pte_phys(__pa(pal_vaddr),
-                                                              PAGE_KERNEL));
+        __this_cpu_write(ia64_mca_pal_base,
+                GRANULEROUNDDOWN((unsigned long) pal_vaddr));
+        __this_cpu_write(ia64_mca_pal_pte, pte_val(mk_pte_phys(__pa(pal_vaddr),
+                                                              PAGE_KERNEL)));
 }
 
 static void ia64_mca_cmc_vector_adjust(void *dummy)