These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / um / drivers / slip_user.c

diff --git a/kernel/arch/um/drivers/slip_user.c b/kernel/arch/um/drivers/slip_user.c
index 55c290d..0d6b66c 100644 (file)
--- a/kernel/arch/um/drivers/slip_user.c
+++ b/kernel/arch/um/drivers/slip_user.c
@@ -55,8 +55,8 @@ static int set_up_tty(int fd)
 }
 
 struct slip_pre_exec_data {
-       int stdin;
-       int stdout;
+       int stdin_fd;
+       int stdout_fd;
        int close_me;
 };
 
@@ -64,9 +64,9 @@ static void slip_pre_exec(void *arg)
 {
        struct slip_pre_exec_data *data = arg;
 
-       if (data->stdin >= 0)
-               dup2(data->stdin, 0);
-       dup2(data->stdout, 1);
+       if (data->stdin_fd >= 0)
+               dup2(data->stdin_fd, 0);
+       dup2(data->stdout_fd, 1);
        if (data->close_me >= 0)
                close(data->close_me);
 }
@@ -85,8 +85,8 @@ static int slip_tramp(char **argv, int fd)
        }
 
        err = 0;
-       pe_data.stdin = fd;
-       pe_data.stdout = fds[1];
+       pe_data.stdin_fd = fd;
+       pe_data.stdout_fd = fds[1];
        pe_data.close_me = fds[0];
        err = run_helper(slip_pre_exec, &pe_data, argv);
        if (err < 0)