From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 4 Mar 2015 05:35:43 +0000 (+0100)
Subject: Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d2c032e3dc58137a7261a7824d3acce435db1d66;p=deliverable%2Flinux.git

Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

d2c032e3dc58137a7261a7824d3acce435db1d66
diff --cc arch/x86/mm/init.c
index 090499a363cb,a110efca6d06..52417e771af9
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -177,10 -177,9 +177,10 @@@ static void __init probe_page_size_mask
  
  	/* 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;
 -	}
 +	} else
 +		__supported_pte_mask &= ~_PAGE_GLOBAL;
  }
  
  #ifdef CONFIG_X86_32