Merge branch 'x86/asm' into x86/core, to pick up dependent commits

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/entry/entry.S
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/kernel/smpboot.c
index 4be00831656c4cd727bdfe39d99df457cff343c9,8ecf1bf5710386ca0d3d70d3a8cb0a41ed92ee39..c5aabddf557341a0a435edb2aaa6684a08d35085
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -314,28 -314,7 +314,8 @@@ static void notrace __noendbr start_sec
        wmb();
        cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
  }
 +ANNOTATE_NOENDBR_SYM(start_secondary);
  
- /*
-  * The bootstrap kernel entry code has set these up. Save them for
-  * a given CPU
-  */
- void smp_store_cpu_info(int id)
- {
-       struct cpuinfo_x86 *c = &cpu_data(id);
- 
-       /* Copy boot_cpu_data only on the first bringup */
-       if (!c->initialized)
-               *c = boot_cpu_data;
-       c->cpu_index = id;
-       /*
-        * During boot time, CPU0 has this setup already. Save the info when
-        * bringing up an AP.
-        */
-       identify_secondary_cpu(c);
-       c->initialized = true;
- }
- 
  static bool
  topology_same_node(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
  {

diff --cc arch/x86/lib/Makefile
Simple merge

diff --cc arch/x86/xen/xen-head.S
Simple merge