manual merge of x86/mm

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

diff --cc arch/x86/include/asm/apic.h
index 88093c1d44fd4c99064315eff9f169a8ef33235a,a907d4d251a83baceed25ac6a29689e9c49484ed..c2768094117f38345bfa7a42e95bb3664b4b8f2d
--- 1/arch/x86/include/asm/apic.h
--- 2/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@@ -538,12 -537,7 +538,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 mm/memory.c
Simple merge