[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1J6X0S-0007SZ-Aa@ZenIV.linux.org.uk>
Date: Sun, 23 Dec 2007 20:01:04 +0000
From: Al Viro <viro@....linux.org.uk>
To: torvalds@...ux-foundation.org
Cc: jdike@...toit.com, linux-kernel@...r.kernel.org
Subject: [PATCH] uml: user of helper_wait() got missed when it got extra arguments
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
arch/um/drivers/harddog_user.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index b56f8e0..448ba59 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
n = read(in_fds[0], &c, sizeof(c));
if (n == 0) {
printk("harddog_open - EOF on watchdog pipe\n");
- helper_wait(pid);
+ helper_wait(pid, 1, NULL);
err = -EIO;
goto out_close_out;
}
else if (n < 0) {
printk("harddog_open - read of watchdog pipe failed, "
"err = %d\n", errno);
- helper_wait(pid);
+ helper_wait(pid, 1, NULL);
err = n;
goto out_close_out;
}
--
1.5.3.GIT
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists