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

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

diff --git a/kernel/arch/um/drivers/harddog_user.c b/kernel/arch/um/drivers/harddog_user.c
index f99b32a..3aa8b0d 100644 (file)
--- a/kernel/arch/um/drivers/harddog_user.c
+++ b/kernel/arch/um/drivers/harddog_user.c
@@ -9,8 +9,8 @@
 #include <os.h>
 
 struct dog_data {
-       int stdin;
-       int stdout;
+       int stdin_fd;
+       int stdout_fd;
        int close_me[2];
 };
 
@@ -18,11 +18,11 @@ static void pre_exec(void *d)
 {
        struct dog_data *data = d;
 
-       dup2(data->stdin, 0);
-       dup2(data->stdout, 1);
-       dup2(data->stdout, 2);
-       close(data->stdin);
-       close(data->stdout);
+       dup2(data->stdin_fd, 0);
+       dup2(data->stdout_fd, 1);
+       dup2(data->stdout_fd, 2);
+       close(data->stdin_fd);
+       close(data->stdout_fd);
        close(data->close_me[0]);
        close(data->close_me[1]);
 }
@@ -49,8 +49,8 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
                goto out_close_in;
        }
 
-       data.stdin = out_fds[0];
-       data.stdout = in_fds[1];
+       data.stdin_fd = out_fds[0];
+       data.stdout_fd = in_fds[1];
        data.close_me[0] = out_fds[1];
        data.close_me[1] = in_fds[0];