Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86/mm changes from Peter Anvin:
 "The big change here is the patchset by Alex Shi to use INVLPG to flush
  only the affected pages when we only need to flush a small page range.

  It also removes the special INVALIDATE_TLB_VECTOR interrupts (32
  vectors!) and replace it with an ordinary IPI function call."

Fix up trivial conflicts in arch/x86/include/asm/apic.h (added code next
to changed line)

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tlb: Fix build warning and crash when building for !SMP
  x86/tlb: do flush_tlb_kernel_range by 'invlpg'
  x86/tlb: replace INVALIDATE_TLB_VECTOR by CALL_FUNCTION_VECTOR
  x86/tlb: enable tlb flush range support for x86
  mm/mmu_gather: enable tlb flush range in generic mmu_gather
  x86/tlb: add tlb_flushall_shift knob into debugfs
  x86/tlb: add tlb_flushall_shift for specific CPU
  x86/tlb: fall back to flush all when meet a THP large page
  x86/flush_tlb: try flush_tlb_single one by one in flush_tlb_range
  x86/tlb_info: get last level TLB entry number of CPU
  x86: Add read_mostly declaration/definition to variables from smp.h
  x86: Define early read-mostly per-cpu macros

diff --cc arch/x86/include/asm/apic.h
index 3ea51a84a0e447a1644851500c3470cfd99a46c2,a907d4d251a83baceed25ac6a29689e9c49484ed..f34261296ffb71bc9f62f57ecf069508fe40d9d6
--- 1/arch/x86/include/asm/apic.h
--- 2/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@@ -541,12 -537,7 +541,12 @@@ static inline const struct cpumask *def
  #endif
  }
  
- DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
 +static inline const struct cpumask *online_target_cpus(void)
 +{
 +      return cpu_online_mask;
 +}
 +
+ DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_bios_cpu_apicid);
  
  
  static inline unsigned int read_apic_id(void)

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

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

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

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

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

diff --cc arch/x86/kernel/entry_64.S
Simple merge

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

diff --cc arch/x86/platform/uv/tlb_uv.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc mm/memory.c
Simple merge