[GIT PULL] x86 fixes

Ingo Molnar
2022-08-06T19:29:50Z

Linus,

Please pull the latest x86/urgent git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2022-08-06

# HEAD: de979c83574abf6e78f3fa65b716515c91b2613d x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y

Misc fixes:

- an old(er) binutils build fix,
- a new-GCC build fix,
- and a kexec boot environment fix.

NOTE, there's a new conflict in arch/x86/um/Makefile, due to these two
commits interacting:

upstream: # 5b301409e8bc UML: add support for KASAN under x86_64
# adds two new targets to the single subarch-y line

x86/urgent: # de979c83574a x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y
# splits the ../entry/thunk_64.o target from the subarch-y line

it's a context conflict only, my resolution was:

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

Thanks,

Ingo

------------------>
Andrea Righi (1):
x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y

Chenyi Qiang (1):
x86/bus_lock: Don't assume the init value of DEBUGCTLMSR.BUS_LOCK_DETECT to be zero

Siddh Raman Pant (1):
x86/numa: Use cpumask_available instead of hardcoded NULL check

arch/x86/entry/Makefile | 3 ++-
arch/x86/entry/thunk_32.S | 2 --
arch/x86/entry/thunk_64.S | 4 ----
arch/x86/kernel/cpu/intel.c | 27 ++++++++++++++-------------
arch/x86/mm/numa.c | 4 ++--
arch/x86/um/Makefile | 3 ++-
6 files changed, 20 insertions(+), 23 deletions(-)