diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 14:35:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 14:35:14 -0700 |
| commit | 4e583ff9df9126e275c32c6ecff54b0316fe1dee (patch) | |
| tree | d127a9121e0aa3a54f8aa29da131cb66282a2b9b /arch/um/drivers/Makefile | |
| parent | a01fe7ec42b7fcd4201084dc56a2372f7b101f99 (diff) | |
| parent | 2a4a62a14be1947fa945c5c11ebf67326381a568 (diff) | |
| download | linux-4e583ff9df9126e275c32c6ecff54b0316fe1dee.tar.bz2 | |
Merge tag 'for-linus-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Various cleanups and fixes: xterm, serial line, time travel
- Set ARCH_HAS_GCOV_PROFILE_ALL
* tag 'for-linus-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix out-of-bounds read in LDT setup
um: chan_user: Fix winch_tramp() return value
um: virtio_uml: Fix broken device handling in time-travel
um: line: Use separate IRQs per line
um: Enable ARCH_HAS_GCOV_PROFILE_ALL
um: Use asm-generic/dma-mapping.h
um: daemon: Make default socket configurable
um: xterm: Make default terminal emulator configurable
Diffstat (limited to 'arch/um/drivers/Makefile')
| -rw-r--r-- | arch/um/drivers/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile index 803666e85414..e1dc4292bd22 100644 --- a/arch/um/drivers/Makefile +++ b/arch/um/drivers/Makefile @@ -70,4 +70,6 @@ obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH) +CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"' + include arch/um/scripts/Makefile.rules |