diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 00:35:14 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 00:35:14 +0300 |
| commit | 4e583ff9df9126e275c32c6ecff54b0316fe1dee (patch) | |
| tree | d127a9121e0aa3a54f8aa29da131cb66282a2b9b /arch/um/drivers/daemon_kern.c | |
| parent | a01fe7ec42b7fcd4201084dc56a2372f7b101f99 (diff) | |
| parent | 2a4a62a14be1947fa945c5c11ebf67326381a568 (diff) | |
| download | linux-4e583ff9df9126e275c32c6ecff54b0316fe1dee.tar.xz | |
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/daemon_kern.c')
| -rw-r--r-- | arch/um/drivers/daemon_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c index fd2402669c49..afde1e82c056 100644 --- a/arch/um/drivers/daemon_kern.c +++ b/arch/um/drivers/daemon_kern.c @@ -65,7 +65,7 @@ static int daemon_setup(char *str, char **mac_out, void *data) *init = ((struct daemon_init) { .sock_type = "unix", - .ctl_sock = "/tmp/uml.ctl" }); + .ctl_sock = CONFIG_UML_NET_DAEMON_DEFAULT_SOCK }); remain = split_if_spec(str, mac_out, &init->sock_type, &init->ctl_sock, NULL); |