Merge tag 'x86-splitlock-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 splitlock updates from Ingo Molnar:

 - Move Split and Bus lock code to a dedicated file (Ravi Bangoria)

 - Add split/bus lock support for AMD (Ravi Bangoria)

* tag 'x86-splitlock-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/bus_lock: Add support for AMD
  x86/split_lock: Move Split and Bus lock code to a dedicated file

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/cpu.h
index 5af69b5be2fb7378a5585acfcd1fcddac8c042b6,86cf7952ee86a7681cff86e1ed00c53bd252a1e5..98eced5084ca7448a512ed3582e5bba752acf9a0
--- 1/arch/x86/include/asm/cpu.h
--- 2/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@@ -46,7 -46,13 +46,14 @@@ static inline bool handle_guest_split_l
  }
  
  static inline void handle_bus_lock(struct pt_regs *regs) {}
+ static inline void split_lock_init(void) {}
+ static inline void bus_lock_init(void) {}
+ #endif
  
+ #ifdef CONFIG_CPU_SUP_INTEL
+ u8 get_this_hybrid_cpu_type(void);
++u32 get_this_hybrid_cpu_native_id(void);
+ #else
  static inline u8 get_this_hybrid_cpu_type(void)
  {
        return 0;

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

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

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge