manual merge of x86/mm

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/elf.h
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init.c
index 52417e771af9f66029f42812d02cbce58953b76a,4469563f8c3b3ece258e2f5ad59d80c76bd1573f..1d553186c4345c02be5c0152764d988cfe365ae1
--- 1/arch/x86/mm/init.c
--- 2/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