diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-04 18:15:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-04 18:15:10 -0700 |
| commit | d665ea6ea86c785760ee4bad4543dab3267ad074 (patch) | |
| tree | a1b058e5705784a7408afccfc2a6deef1da93c3c /arch/x86/um/Makefile | |
| parent | 51f629446cd172e324deb0146741888cac5dedca (diff) | |
| parent | ed102bf2afed226703eaf85a704755bdbea34583 (diff) | |
| download | linux-stable-d665ea6ea86c785760ee4bad4543dab3267ad074.tar.gz linux-stable-d665ea6ea86c785760ee4bad4543dab3267ad074.tar.bz2 linux-stable-d665ea6ea86c785760ee4bad4543dab3267ad074.zip | |
Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Disable CONFIG_GCOV when built with modules
- Many fixes for W=1 related warnings
- Code cleanup
* tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix W=1 missing-include-dirs warnings
um: elf.h: Fix W=1 warning for empty body in 'do' statement
um: pgtable.h: Fix W=1 warning for empty body in 'do' statement
um: Remove unused including <linux/version.h>
um: Add 2 missing libs to fix various build errors
um: Replace if (cond) BUG() with BUG_ON()
um: Disable CONFIG_GCOV with MODULES
um: Remove unneeded variable 'ret'
um: Mark all kernel symbols as local
um: Fix tag order in stub_32.h
Diffstat (limited to 'arch/x86/um/Makefile')
| -rw-r--r-- | arch/x86/um/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index 77f70b969d14..5ccb18290d71 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -21,6 +21,7 @@ obj-y += checksum_32.o syscalls_32.o obj-$(CONFIG_ELF_CORE) += elfcore.o subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o +subarch-y += ../lib/cmpxchg8b_emu.o ../lib/atomic64_386_32.o subarch-y += ../kernel/sys_ia32.o else |