Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 fixes from Ingo Molnar:

 - build fix for old(er) binutils

 - build fix for new GCC

 - kexec boot environment fix

* tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y
  x86/numa: Use cpumask_available instead of hardcoded NULL check
  x86/bus_lock: Don't assume the init value of DEBUGCTLMSR.BUS_LOCK_DETECT to be zero

diff --cc arch/x86/um/Makefile
index f778e37494bab2654b62139012db2791651d597f,a8cde4e8ab1149102f442ecd721a3caa966230c8..3d5cd2e578202ea8f2b3ac62585c43fc908b3d50
--- 1/arch/x86/um/Makefile
--- 2/arch/x86/um/Makefile
+++ b/arch/x86/um/Makefile
@@@ -28,8 -28,8 +28,9 @@@ els
  
  obj-y += syscalls_64.o vdso/
  
- subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o \
 -subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o
++subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o \
 +      ../lib/memmove_64.o ../lib/memset_64.o
+ subarch-$(CONFIG_PREEMPTION) += ../entry/thunk_64.o
  
  endif