diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2022-08-06 17:45:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2022-08-06 17:45:37 -0700 |
| commit | 1612c382ffbdf1f673caec76502b1c00e6d35363 (patch) | |
| tree | d4ebbbe34a2d1b6fee1cf62ecb4077c1a1367455 /arch/x86/um | |
| parent | Merge tag 'sched-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y (diff) | |
| download | linux-1612c382ffbdf1f673caec76502b1c00e6d35363.tar.gz linux-1612c382ffbdf1f673caec76502b1c00e6d35363.tar.bz2 linux-1612c382ffbdf1f673caec76502b1c00e6d35363.zip | |
Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index f778e37494ba..3d5cd2e57820 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -28,8 +28,9 @@ else 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 \ ../lib/memmove_64.o ../lib/memset_64.o +subarch-$(CONFIG_PREEMPTION) += ../entry/thunk_64.o endif |