Merge tag 'v3.18-rc1' into v4l_for_linus

[cascardo/linux.git] / arch / sparc / mm / tlb.c

diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index b89aba2..9df2190 100644 (file)
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -52,14 +52,14 @@ out:
 
 void arch_enter_lazy_mmu_mode(void)
 {
-       struct tlb_batch *tb = &__get_cpu_var(tlb_batch);
+       struct tlb_batch *tb = this_cpu_ptr(&tlb_batch);
 
        tb->active = 1;
 }
 
 void arch_leave_lazy_mmu_mode(void)
 {
-       struct tlb_batch *tb = &__get_cpu_var(tlb_batch);
+       struct tlb_batch *tb = this_cpu_ptr(&tlb_batch);
 
        if (tb->tlb_nr)
                flush_tlb_pending();