1 files changed, 3 insertions, 7 deletions

diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index c0e108e08079..36a1a2ab87d2 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -62,11 +62,7 @@ static inline void __flush_tlb_one(unsigned long addr)
                 __flush_tlb();
 }
 
-#ifdef CONFIG_X86_32
-# define TLB_FLUSH_ALL  0xffffffff
-#else
-# define TLB_FLUSH_ALL  -1ULL
-#endif
+#define TLB_FLUSH_ALL   -1UL
 
 /*
  * TLB flushing:
@@ -156,8 +152,8 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate);
 
 static inline void reset_lazy_tlbstate(void)
 {
-        percpu_write(cpu_tlbstate.state, 0);
-        percpu_write(cpu_tlbstate.active_mm, &init_mm);
+        this_cpu_write(cpu_tlbstate.state, 0);
+        this_cpu_write(cpu_tlbstate.active_mm, &init_mm);
 }
 
 #endif  /* SMP */