Merge branch 'x86/mm' into x86/boot, to pick up dependencies

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

diff --combined arch/x86/Kconfig
index 770ae52,d9a94da..930fe88
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -1934,26 -1934,21 +1934,26 @@@ config RANDOMIZE_BAS
          attempts relying on knowledge of the location of kernel
          code internals.
  
 -        The kernel physical and virtual address can be randomized
 -        from 16MB up to 1GB on 64-bit and 512MB on 32-bit. (Note that
 -        using RANDOMIZE_BASE reduces the memory space available to
 -        kernel modules from 1.5GB to 1GB.)
 +        On 64-bit, the kernel physical and virtual addresses are
 +        randomized separately. The physical address will be anywhere
 +        between 16MB and the top of physical memory (up to 64TB). The
 +        virtual address will be randomized from 16MB up to 1GB (9 bits
 +        of entropy). Note that this also reduces the memory space
 +        available to kernel modules from 1.5GB to 1GB.
 +
 +        On 32-bit, the kernel physical and virtual addresses are
 +        randomized together. They will be randomized from 16MB up to
 +        512MB (8 bits of entropy).
  
          Entropy is generated using the RDRAND instruction if it is
          supported. If RDTSC is supported, its value is mixed into
          the entropy pool as well. If neither RDRAND nor RDTSC are
 -        supported, then entropy is read from the i8254 timer.
 -
 -        Since the kernel is built using 2GB addressing, and
 -        PHYSICAL_ALIGN must be at a minimum of 2MB, only 10 bits of
 -        entropy is theoretically possible. Currently, with the
 -        default value for PHYSICAL_ALIGN and due to page table
 -        layouts, 64-bit uses 9 bits of entropy and 32-bit uses 8 bits.
 +        supported, then entropy is read from the i8254 timer. The
 +        usable entropy is limited by the kernel being built using
 +        2GB addressing, and that PHYSICAL_ALIGN must be at a
 +        minimum of 2MB. As a result, only 10 bits of entropy are
 +        theoretically possible, but the implementations are further
 +        limited due to memory layouts.
  
          If CONFIG_HIBERNATE is also enabled, KASLR is disabled at boot
          time. To enable it, boot with "kaslr" on the kernel command
@@@ -2444,6 -2439,15 +2444,15 @@@ config PCI_CNB20LE_QUIR
  
  source "drivers/pci/Kconfig"
  
+ config ISA_BUS
+       bool "ISA-style bus support on modern systems" if EXPERT
+       select ISA_BUS_API
+       help
+         Enables ISA-style drivers on modern systems. This is necessary to
+         support PC/104 devices on X86_64 platforms.
+ 
+         If unsure, say N.
+ 
  # x86_64 have no ISA slots, but can have ISA-style DMA.
  config ISA_DMA_API
        bool "ISA-style DMA support" if (X86_64 && EXPERT)