From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Aug 2022 00:45:37 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~668
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1612c382ffbdf1f673caec76502b1c00e6d35363;p=platform%2Fkernel%2Flinux-starfive.git

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

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
---

1612c382ffbdf1f673caec76502b1c00e6d35363
diff --cc arch/x86/um/Makefile
index f778e37,a8cde4e..3d5cd2e
--- a/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