The patch titled
ipmi: add the standard watchdog timeout ioctls
has been added to the -mm tree. Its filename is
ipmi-add-the-standard-watchdog-timeout-ioctls.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ipmi: add the standard watchdog timeout ioctls
From: Corey Minyard <cminyard@xxxxxxxxxx>
Add the standard IOCTLs to the IPMI driver for setting and getting
the pretimeout. Tested by Benoît Guillon.
Signed off by: Corey Minyard <cminyard@xxxxxxxxxx>
Cc: Benoît Guillon <guillon@xxxxxxxxxxxxxxxxxx>
Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/ipmi/ipmi_watchdog.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/char/ipmi/ipmi_watchdog.c~ipmi-add-the-standard-watchdog-timeout-ioctls drivers/char/ipmi/ipmi_watchdog.c
--- a/drivers/char/ipmi/ipmi_watchdog.c~ipmi-add-the-standard-watchdog-timeout-ioctls
+++ a/drivers/char/ipmi/ipmi_watchdog.c
@@ -669,6 +669,7 @@ static int ipmi_ioctl(struct inode *inod
return 0;
case WDIOC_SET_PRETIMEOUT:
+ case WDIOC_SETPRETIMEOUT:
i = copy_from_user(&val, argp, sizeof(int));
if (i)
return -EFAULT;
@@ -676,6 +677,7 @@ static int ipmi_ioctl(struct inode *inod
return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
case WDIOC_GET_PRETIMEOUT:
+ case WDIOC_GETPRETIMEOUT:
i = copy_to_user(argp, &pretimeout, sizeof(pretimeout));
if (i)
return -EFAULT;
_
Patches currently in -mm which might be from cminyard@xxxxxxxxxx are
ipmi-add-the-standard-watchdog-timeout-ioctls.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
