[PATCH] [2/3] x86: Remove CONFIG_GBPAGES option

[Andi Kleen <andi@firstfloor.org>]

Support for GB pages mapped direct memory has been around for quite
some time and has not caused any problems as far as I know.

So it's time to remove the CONFIG_GBPAGES option and always enable
it by default. The option only controlled the default anyways, no
code. gbpages can be still disabled at runtime.

Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
 arch/x86/Kconfig   |    9 ---------
 arch/x86/mm/init.c |    6 +-----
 2 files changed, 1 insertion(+), 14 deletions(-)

Index: linux-2.6.32-ak/arch/x86/Kconfig
===================================================================
--- linux-2.6.32-ak.orig/arch/x86/Kconfig
+++ linux-2.6.32-ak/arch/x86/Kconfig
@@ -1110,15 +1110,6 @@ config X86_PAE
 config ARCH_PHYS_ADDR_T_64BIT
 	def_bool X86_64 || X86_PAE
 
-config DIRECT_GBPAGES
-	bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
-	default y
-	depends on X86_64
-	---help---
-	  Allow the kernel linear mapping to use 1GB pages on CPUs that
-	  support it. This can improve the kernel's performance a tiny bit by
-	  reducing TLB pressure. If in doubt, say "Y".
-
 # Common NUMA Features
 config NUMA
 	bool "Numa Memory Allocation and Scheduler Support"
Index: linux-2.6.32-ak/arch/x86/mm/init.c
===================================================================
--- linux-2.6.32-ak.orig/arch/x86/mm/init.c
+++ linux-2.6.32-ak/arch/x86/mm/init.c
@@ -22,11 +22,7 @@ unsigned long __meminitdata e820_table_t
 
 int after_bootmem;
 
-int direct_gbpages
-#ifdef CONFIG_DIRECT_GBPAGES
-				= 1
-#endif
-;
+int direct_gbpages = 1;
 
 static void __init find_early_table_space(unsigned long end, int use_pse,
 					  int use_gbpages)