lkml.org 
[lkml]   [2004]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[WATCHDOG] v2.6.8.1 watchdog-patches
    Hi Linus, Andrew,

    please do a

    bk pull http://linux-watchdog.bkbits.net/linux-2.6-watchdog

    This will update the following files:

    Documentation/watchdog/pcwd-watchdog.txt | 3 ++-
    include/linux/compat_ioctl.h | 6 ++++--
    2 files changed, 6 insertions(+), 3 deletions(-)

    through these ChangeSets:

    <arnd@arndb.de> (04/08/20 1.1838)
    [WATCHDOG] v2.6.8.1 compat_ioctl-patch

    The watchdog ioctl interface is defined correctly for 32 bit emulation,
    although WIOC_GETSUPPORT was not marked as such, for an unclear reason.
    WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT were added in may 2002 to the
    code but never to the ioctl list. This adds all three definitions.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

    <fl@fl.priv.at> (04/08/20 1.1839)
    [WATCHDOG] pcwd-watchdog.txt-patch

    Fix example program in pcwd-watchdog.txt document.


    The ChangeSets can also be looked at on:
    http://linux-watchdog.bkbits.net:8080/linux-2.6-watchdog

    For completeness, I added the patches below.

    Greetings,
    Wim.

    ================================================================================
    diff -Nru a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h
    --- a/include/linux/compat_ioctl.h 2004-08-20 09:06:54 +02:00
    +++ b/include/linux/compat_ioctl.h 2004-08-20 09:06:54 +02:00
    @@ -592,13 +592,15 @@
    COMPATIBLE_IOCTL(ATMTCP_REMOVE)
    COMPATIBLE_IOCTL(ATMMPC_CTRL)
    COMPATIBLE_IOCTL(ATMMPC_DATA)
    -/* Big W */
    -/* WIOC_GETSUPPORT not yet implemented -E */
    +/* Watchdog */
    +COMPATIBLE_IOCTL(WDIOC_GETSUPPORT)
    COMPATIBLE_IOCTL(WDIOC_GETSTATUS)
    COMPATIBLE_IOCTL(WDIOC_GETBOOTSTATUS)
    COMPATIBLE_IOCTL(WDIOC_GETTEMP)
    COMPATIBLE_IOCTL(WDIOC_SETOPTIONS)
    COMPATIBLE_IOCTL(WDIOC_KEEPALIVE)
    +COMPATIBLE_IOCTL(WDIOC_SETTIMEOUT)
    +COMPATIBLE_IOCTL(WDIOC_GETTIMEOUT)
    /* Big R */
    COMPATIBLE_IOCTL(RNDGETENTCNT)
    COMPATIBLE_IOCTL(RNDADDTOENTCNT)
    diff -Nru a/Documentation/watchdog/pcwd-watchdog.txt b/Documentation/watchdog/pcwd-watchdog.txt
    --- a/Documentation/watchdog/pcwd-watchdog.txt 2004-08-20 09:06:56 +02:00
    +++ b/Documentation/watchdog/pcwd-watchdog.txt 2004-08-20 09:06:56 +02:00
    @@ -35,7 +35,8 @@
    #include <unistd.h>
    #include <fcntl.h>
    #include <sys/ioctl.h>
    -#include <linux/pcwd.h>
    +#include <linux/types.h>
    +#include <linux/watchdog.h>

    int fd;

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:05    [W:0.023 / U:0.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site