Merge branch 'x86/urgent' into x86/asm

Get the cr4 fixes so we can apply the final cleanup

diff --combined arch/x86/kernel/setup.c
index 44c868e,98c9cd6..87f2330
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -210,9 -210,9 +210,9 @@@ EXPORT_SYMBOL(boot_cpu_data)
  
  
  #if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
 -__visible unsigned long mmu_cr4_features;
 +__visible unsigned long mmu_cr4_features __ro_after_init;
  #else
 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
 +__visible unsigned long mmu_cr4_features __ro_after_init = X86_CR4_PAE;
  #endif
  
  /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
@@@ -1137,9 -1137,7 +1137,7 @@@ void __init setup_arch(char **cmdline_p
         * auditing all the early-boot CR4 manipulation would be needed to
         * rule it out.
         */
-       if (boot_cpu_data.cpuid_level >= 0)
-               /* A CPU has %cr4 if and only if it has CPUID. */
-               mmu_cr4_features = __read_cr4();
+       mmu_cr4_features = __read_cr4_safe();
  
        memblock_set_current_limit(get_max_mapped());