Commit:     e4d06b3f904ddfab4531a1e23f1f5e1bd284b605
Parent:     b32eb52e4093351bd0debd027575578a599bfb3e
Author:     Johann Felix Soden <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 23 15:23:49 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Feb 23 17:12:15 2008 -0800

    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 
      /arch/um/drivers/harddog_user.c:89: error: too many arguments to function 
    Signed-off-by: Johann Felix Soden <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 448ba59..b56f8e0 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 
        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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to