summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJohann Felix Soden <johfel@users.sourceforge.net>2008-02-23 15:23:49 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-23 17:12:15 -0800
commite4d06b3f904ddfab4531a1e23f1f5e1bd284b605 (patch)
tree3d5c4e1ec5823240fb060daaa5d2472bd697ba57 /arch/um
parentb32eb52e4093351bd0debd027575578a599bfb3e (diff)
downloadblackbird-op-linux-e4d06b3f904ddfab4531a1e23f1f5e1bd284b605.tar.gz
blackbird-op-linux-e4d06b3f904ddfab4531a1e23f1f5e1bd284b605.zip
uml: fix helper_wait calls in watchdog
In commit 1aa351a308d2c3ddb92b6cc45083fc54271d0010 ("uml: tidy helper code") the arguments of helper_wait() were changed. The adaptation of harddog_user.c was forgotten, so this errors occur: /arch/um/drivers/harddog_user.c: In function 'start_watchdog': /arch/um/drivers/harddog_user.c:82: error: too many arguments to function 'helper_wait' /arch/um/drivers/harddog_user.c:89: error: too many arguments to function 'helper_wait' Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net> Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/harddog_user.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 448ba59207a1..b56f8e0196a9 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, 1, NULL);
+ helper_wait(pid);
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, 1, NULL);
+ helper_wait(pid);
err = n;
goto out_close_out;
}
OpenPOWER on IntegriCloud