Merge branch 'WIP.x86/process' into perf/core

diff --combined arch/x86/include/asm/tlbflush.h
index fc5abff9b7fd63d6b3a01a18061be8b3f752d109,ff4923a19f791e6de8fd927474586ad9d3a9db12..75d002bdb3f35bcc12c06ec4acc213bc49241ae9
--- 1/arch/x86/include/asm/tlbflush.h
--- 2/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@@ -110,6 -110,16 +110,16 @@@ static inline void cr4_clear_bits(unsig
        }
  }
  
+ static inline void cr4_toggle_bits(unsigned long mask)
+ {
+       unsigned long cr4;
+ 
+       cr4 = this_cpu_read(cpu_tlbstate.cr4);
+       cr4 ^= mask;
+       this_cpu_write(cpu_tlbstate.cr4, cr4);
+       __write_cr4(cr4);
+ }
+ 
  /* Read the CR4 shadow. */
  static inline unsigned long cr4_read_shadow(void)
  {
@@@ -188,7 -198,7 +198,7 @@@ static inline void __native_flush_tlb_s
  
  static inline void __flush_tlb_all(void)
  {
 -      if (static_cpu_has(X86_FEATURE_PGE))
 +      if (boot_cpu_has(X86_FEATURE_PGE))
                __flush_tlb_global();
        else
                __flush_tlb();