From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 7 Apr 2015 14:07:14 +0000 (+0200)
Subject: manual merge of x86/mm
X-Git-Tag: KARO-TXA5-2015-06-26~56^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0c36cbcbd27ee861d8e6770c0dfb7a654d4a28e;p=karo-tx-linux.git

manual merge of x86/mm

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

a0c36cbcbd27ee861d8e6770c0dfb7a654d4a28e
diff --cc arch/x86/mm/init.c
index 52417e771af9,4469563f8c3b..1d553186c434
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -179,8 -165,15 +165,16 @@@ static void __init probe_page_size_mask
  	if (cpu_has_pge) {
  		cr4_set_bits_and_update_boot(X86_CR4_PGE);
  		__supported_pte_mask |= _PAGE_GLOBAL;
 -	}
 +	} else
 +		__supported_pte_mask &= ~_PAGE_GLOBAL;
+ 
+ 	/* Enable 1 GB linear kernel mappings if available: */
+ 	if (direct_gbpages && cpu_has_gbpages) {
+ 		printk(KERN_INFO "Using GB pages for direct mapping\n");
+ 		page_size_mask |= 1 << PG_LEVEL_1G;
+ 	} else {
+ 		direct_gbpages = 0;
+ 	}
  }
  
  #ifdef CONFIG_X86_32