diff options
author | Johann Felix Soden <johfel@users.sourceforge.net> | 2008-02-23 18:23:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 20:12:15 -0500 |
commit | e4d06b3f904ddfab4531a1e23f1f5e1bd284b605 (patch) | |
tree | 3d5c4e1ec5823240fb060daaa5d2472bd697ba57 /arch/um | |
parent | b32eb52e4093351bd0debd027575578a599bfb3e (diff) |
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.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 448ba59207a..b56f8e0196a 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) | |||
79 | n = read(in_fds[0], &c, sizeof(c)); | 79 | n = read(in_fds[0], &c, sizeof(c)); |
80 | if (n == 0) { | 80 | if (n == 0) { |
81 | printk("harddog_open - EOF on watchdog pipe\n"); | 81 | printk("harddog_open - EOF on watchdog pipe\n"); |
82 | helper_wait(pid, 1, NULL); | 82 | helper_wait(pid); |
83 | err = -EIO; | 83 | err = -EIO; |
84 | goto out_close_out; | 84 | goto out_close_out; |
85 | } | 85 | } |
86 | else if (n < 0) { | 86 | else if (n < 0) { |
87 | printk("harddog_open - read of watchdog pipe failed, " | 87 | printk("harddog_open - read of watchdog pipe failed, " |
88 | "err = %d\n", errno); | 88 | "err = %d\n", errno); |
89 | helper_wait(pid, 1, NULL); | 89 | helper_wait(pid); |
90 | err = n; | 90 | err = n; |
91 | goto out_close_out; | 91 | goto out_close_out; |
92 | } | 92 | } |