uml: fix helper_wait calls in watchdog
In commit 1aa351a308
("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>
This commit is contained in:
parent
b32eb52e40
commit
e4d06b3f90
|
@ -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));
|
n = read(in_fds[0], &c, sizeof(c));
|
||||||
if (n == 0) {
|
if (n == 0) {
|
||||||
printk("harddog_open - EOF on watchdog pipe\n");
|
printk("harddog_open - EOF on watchdog pipe\n");
|
||||||
helper_wait(pid, 1, NULL);
|
helper_wait(pid);
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto out_close_out;
|
goto out_close_out;
|
||||||
}
|
}
|
||||||
else if (n < 0) {
|
else if (n < 0) {
|
||||||
printk("harddog_open - read of watchdog pipe failed, "
|
printk("harddog_open - read of watchdog pipe failed, "
|
||||||
"err = %d\n", errno);
|
"err = %d\n", errno);
|
||||||
helper_wait(pid, 1, NULL);
|
helper_wait(pid);
|
||||||
err = n;
|
err = n;
|
||||||
goto out_close_out;
|
goto out_close_out;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue