lkml.org 
[lkml]   [2008]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/4] UML - Fix helper_wait calls in watchdog
    From: Johann Felix Soden <johfel@users.sourceforge.net>

    In 1aa351a308d2c3ddb92b6cc45083fc54271d0010 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>
    ---
    arch/um/drivers/harddog_user.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6.22/arch/um/drivers/harddog_user.c
    ===================================================================
    --- linux-2.6.22.orig/arch/um/drivers/harddog_user.c 2008-01-17 12:50:20.000000000 -0500
    +++ linux-2.6.22/arch/um/drivers/harddog_user.c 2008-02-11 18:46:05.000000000 -0500
    @@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int *
    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;
    }

    \
     
     \ /
      Last update: 2008-02-12 20:01    [W:0.019 / U:6.940 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site