summaryrefslogtreecommitdiff
path: root/arch/um/drivers/port_user.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-12-03 13:42:17 +0300
committerIngo Molnar <mingo@kernel.org>2018-12-03 13:42:17 +0300
commit5f675231e456cb599b283f8361f01cf34b0617df (patch)
treeafb2bdfd6fdbb18336146f41ba7659120a5ff9d2 /arch/um/drivers/port_user.c
parent3e184501083c38fa091f640acb13af17a21fd228 (diff)
parent2595646791c319cadfdbf271563aac97d0843dc7 (diff)
downloadlinux-5f675231e456cb599b283f8361f01cf34b0617df.tar.xz
Merge tag 'v4.20-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/um/drivers/port_user.c')
-rw-r--r--arch/um/drivers/port_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 9a8e1b64c22e..5f56d11b886f 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -168,7 +168,7 @@ int port_connection(int fd, int *socket, int *pid_out)
{
int new, err;
char *argv[] = { "/usr/sbin/in.telnetd", "-L",
- "/usr/lib/uml/port-helper", NULL };
+ OS_LIB_PATH "/uml/port-helper", NULL };
struct port_pre_exec_data data;
new = accept(fd, NULL, 0);