From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 4 Mar 2025 10:23:48 +0000 (+0100)
Subject: Merge branch 'x86/asm' into x86/core, to pick up dependent commits
X-Git-Tag: v6.15-rc1~216^2~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71c2ff150f34904f693c654ee8c55c996629abb7;p=thirdparty%2Fkernel%2Flinux.git

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

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

71c2ff150f34904f693c654ee8c55c996629abb7
diff --cc arch/x86/kernel/smpboot.c
index 4be00831656c4,8ecf1bf571038..c5aabddf55734
--- a/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)
  {