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

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

diff --git a/kernel/arch/um/drivers/slirp_user.c b/kernel/arch/um/drivers/slirp_user.c
index c999d18..98b6a41 100644 (file)
--- a/kernel/arch/um/drivers/slirp_user.c
+++ b/kernel/arch/um/drivers/slirp_user.c
@@ -20,18 +20,18 @@ static int slirp_user_init(void *data, void *dev)
 }
 
 struct slirp_pre_exec_data {
-       int stdin;
-       int stdout;
+       int stdin_fd;
+       int stdout_fd;
 };
 
 static void slirp_pre_exec(void *arg)
 {
        struct slirp_pre_exec_data *data = arg;
 
-       if (data->stdin != -1)
-               dup2(data->stdin, 0);
-       if (data->stdout != -1)
-               dup2(data->stdout, 1);
+       if (data->stdin_fd != -1)
+               dup2(data->stdin_fd, 0);
+       if (data->stdout_fd != -1)
+               dup2(data->stdout_fd, 1);
 }
 
 static int slirp_tramp(char **argv, int fd)
@@ -39,8 +39,8 @@ static int slirp_tramp(char **argv, int fd)
        struct slirp_pre_exec_data pe_data;
        int pid;
 
-       pe_data.stdin = fd;
-       pe_data.stdout = fd;
+       pe_data.stdin_fd = fd;
+       pe_data.stdout_fd = fd;
        pid = run_helper(slirp_pre_exec, &pe_data, argv);
 
        return pid;