Merge branch 'x86/pat' into x86/urgent

Merge reason:

Suresh Siddha (1):
      x86, pat: don't use rb-tree based lookup in reserve_memtype()

... requires previous x86/pat commits already pushed to Linus.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --combined arch/x86/kernel/apic/ipi.c
index 6ef00ba,e6b4f51..08385e0
--- 1/arch/x86/kernel/apic/ipi.c
--- 2/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@@ -106,9 -106,6 +106,9 @@@ void default_send_IPI_mask_logical(cons
        unsigned long mask = cpumask_bits(cpumask)[0];
        unsigned long flags;
  
 +      if (WARN_ONCE(!mask, "empty IPI mask"))
 +              return;
 +
        local_irq_save(flags);
        WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]);
        __default_send_IPI_dest_field(mask, vector, apic->dest_logical);
@@@ -153,7 -150,7 +153,7 @@@ int safe_smp_processor_id(void
  {
        int apicid, cpuid;
  
-       if (!boot_cpu_has(X86_FEATURE_APIC))
+       if (!cpu_has_apic)
                return 0;
  
        apicid = hard_smp_processor_id();

diff --combined mm/Kconfig
index fe5f674,fe221c7..3aa519f
--- 1/mm/Kconfig
--- 2/mm/Kconfig
+++ b/mm/Kconfig
@@@ -153,7 -153,7 +153,7 @@@ config MEMORY_HOTREMOV
  #
  config PAGEFLAGS_EXTENDED
        def_bool y
-       depends on 64BIT || SPARSEMEM_VMEMMAP || !NUMA || !SPARSEMEM
+       depends on 64BIT || SPARSEMEM_VMEMMAP || !SPARSEMEM
  
  # Heavily threaded applications may benefit from splitting the mm-wide
  # page_table_lock, so that faults on different parts of the user address
@@@ -225,9 -225,9 +225,9 @@@ config DEFAULT_MMAP_MIN_ADD
          For most ia64, ppc64 and x86 users with lots of address space
          a value of 65536 is reasonable and should cause no problems.
          On arm and other archs it should not be higher than 32768.
 -        Programs which use vm86 functionality would either need additional
 -        permissions from either the LSM or the capabilities module or have
 -        this protection disabled.
 +        Programs which use vm86 functionality or have some need to map
 +        this low address space will need CAP_SYS_RAWIO or disable this
 +        protection by setting the value to 0.
  
          This value can be changed after boot using the
          /proc/sys/vm/mmap_min_addr tunable.