Merge branch 'linus' into x86/memtest

diff --combined arch/x86/Kconfig
index a1a9021146bc38b873f373cc097cb81924ff2779,52e18e6d2ba0aae955bf1624e8370e18229fb861..2d7dc4107764525d09a7bbb35f9dbb0b95586475
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -26,17 -26,10 +26,10 @@@ config X8
        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
        select HAVE_ARCH_KGDB if !X86_VOYAGER
  
- config DEFCONFIG_LIST
+ config ARCH_DEFCONFIG
        string
-       depends on X86_32
-       option defconfig_list
-       default "arch/x86/configs/i386_defconfig"
- 
- config DEFCONFIG_LIST
-       string
-       depends on X86_64
-       option defconfig_list
-       default "arch/x86/configs/x86_64_defconfig"
+       default "arch/x86/configs/i386_defconfig" if X86_32
+       default "arch/x86/configs/x86_64_defconfig" if X86_64
  
  
  config GENERIC_LOCKBREAK
@@@ -419,19 -412,35 +412,19 @@@ config PARAVIR
  
  endif
  
 -config MEMTEST_BOOTPARAM
 -      bool "Memtest boot parameter"
 +config MEMTEST
 +      bool "Memtest"
        depends on X86_64
        default y
        help
          This option adds a kernel parameter 'memtest', which allows memtest
 -        to be disabled at boot.  If this option is selected, memtest
 -        functionality can be disabled with memtest=0 on the kernel
 -        command line.  The purpose of this option is to allow a single
 -        kernel image to be distributed with memtest built in, but not
 -        necessarily enabled.
 -
 +        to be set.
 +              memtest=0, mean disabled; -- default
 +              memtest=1, mean do 1 test pattern;
 +              ...
 +              memtest=4, mean do 4 test patterns.
          If you are unsure how to answer this question, answer Y.
  
 -config MEMTEST_BOOTPARAM_VALUE
 -      int "Memtest boot parameter default value (0-4)"
 -      depends on MEMTEST_BOOTPARAM
 -      range 0 4
 -      default 0
 -      help
 -        This option sets the default value for the kernel parameter
 -        'memtest', which allows memtest to be disabled at boot.  If this
 -        option is set to 0 (zero), the memtest kernel parameter will
 -        default to 0, disabling memtest at bootup.  If this option is
 -        set to 4, the memtest kernel parameter will default to 4,
 -        enabling memtest at bootup, and use that as pattern number.
 -
 -        If you are unsure how to answer this question, answer 0.
 -
  config ACPI_SRAT
        def_bool y
        depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
@@@ -1499,13 -1508,13 +1492,13 @@@ config PCI_GOMMCONFI
  config PCI_GODIRECT
        bool "Direct"
  
- config PCI_GOANY
-       bool "Any"
- 
  config PCI_GOOLPC
        bool "OLPC"
        depends on OLPC
  
+ config PCI_GOANY
+       bool "Any"
+ 
  endchoice
  
  config PCI_BIOS
@@@ -1522,9 -1531,8 +1515,8 @@@ config PCI_MMCONFI
        depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
  
  config PCI_OLPC
-       bool
-       depends on PCI && PCI_GOOLPC
-       default y
+       def_bool y
+       depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
  
  config PCI_DOMAINS
        def_bool y

diff --combined arch/x86/mm/init_64.c
index c6d81316db65772814192e3dd3e14fdf8dcec28b,156e6d7b0e329cd84b06342dffd37e46ec28ac9a..c66aac5500cb93679fd1bdc139552e1be2f26471
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -206,7 -206,7 +206,7 @@@ void __init cleanup_highmap(void
        pmd_t *last_pmd = pmd + PTRS_PER_PMD;
  
        for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
-               if (!pmd_present(*pmd))
+               if (pmd_none(*pmd))
                        continue;
                if (vaddr < (unsigned long) _text || vaddr > end)
                        set_pmd(pmd, __pmd(0));
@@@ -431,7 -431,7 +431,7 @@@ static void __init init_gbpages(void
                direct_gbpages = 0;
  }
  
 -#ifdef CONFIG_MEMTEST_BOOTPARAM
 +#ifdef CONFIG_MEMTEST
  
  static void __init memtest(unsigned long start_phys, unsigned long size,
                                 unsigned pattern)
@@@ -493,8 -493,7 +493,8 @@@
  
  }
  
 -static int memtest_pattern __initdata = CONFIG_MEMTEST_BOOTPARAM_VALUE;
 +/* default is disabled */
 +static int memtest_pattern __initdata;
  
  static int __init parse_memtest(char *arg)
  {
@@@ -507,7 -506,7 +507,7 @@@ early_param("memtest", parse_memtest)
  
  static void __init early_memtest(unsigned long start, unsigned long end)
  {
-       unsigned long t_start, t_size;
+       u64 t_start, t_size;
        unsigned pattern;
  
        if (!memtest_pattern)
@@@ -526,7 -525,7 +526,7 @@@
                        if (t_start + t_size > end)
                                t_size = end - t_start;
  
-                       printk(KERN_CONT "\n  %016lx - %016lx pattern %d",
+                       printk(KERN_CONT "\n  %016llx - %016llx pattern %d",
                                t_start, t_start + t_size, pattern);
  
                        memtest(t_start, t_size, pattern);