1 files changed, 11 insertions, 2 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 649da47d3827..553c094b9cd7 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -173,11 +173,11 @@ static void __init probe_page_size_mask(void)
 
         /* Enable PSE if available */
         if (cpu_has_pse)
-                set_in_cr4(X86_CR4_PSE);
+                cr4_set_bits_and_update_boot(X86_CR4_PSE);
 
         /* Enable PGE if available */
         if (cpu_has_pge) {
-                set_in_cr4(X86_CR4_PGE);
+                cr4_set_bits_and_update_boot(X86_CR4_PGE);
                 __supported_pte_mask |= _PAGE_GLOBAL;
         }
 }
@@ -713,6 +713,15 @@ void __init zone_sizes_init(void)
         free_area_init_nodes(max_zone_pfns);
 }
 
+DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) = {
+#ifdef CONFIG_SMP
+        .active_mm = &init_mm,
+        .state = 0,
+#endif
+        .cr4 = ~0UL,    /* fail hard if we screw up cr4 shadow initialization */
+};
+EXPORT_SYMBOL_GPL(cpu_tlbstate);
+
 void update_cache_mode_entry(unsigned entry, enum page_cache_mode cache)
 {
         /* entry 0 MUST be WB (hardwired to speed up translations) */