[PATCH] 2.5.13 - watchdog patches

Merge updates from the 2.4 kernel into watchdog.h .

diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 46ee52f3e6a1847ebe5e5ee9854e0b56cb960350..391779c8b965ce0b056c3813038b7e26bdaa4bc6 100644 (file)
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -25,7 +25,8 @@ struct watchdog_info {
 #define        WDIOC_GETTEMP           _IOR(WATCHDOG_IOCTL_BASE, 3, int)
 #define        WDIOC_SETOPTIONS        _IOR(WATCHDOG_IOCTL_BASE, 4, int)
 #define        WDIOC_KEEPALIVE         _IOR(WATCHDOG_IOCTL_BASE, 5, int)
-#define        WDIOC_SETTIMEOUT        _IOW(WATCHDOG_IOCTL_BASE, 6, int)
+#define        WDIOC_SETTIMEOUT        _IOWR(WATCHDOG_IOCTL_BASE, 6, int)
+#define        WDIOC_GETTIMEOUT        _IOR(WATCHDOG_IOCTL_BASE, 7, int)
 
 #define        WDIOF_UNKNOWN           -1      /* Unknown flag error */
 #define        WDIOS_UNKNOWN           -1      /* Unknown status error */
@@ -37,6 +38,7 @@ struct watchdog_info {
 #define        WDIOF_POWERUNDER        0x0010  /* Power bad/power fault */
 #define        WDIOF_CARDRESET         0x0020  /* Card previously reset the CPU */
 #define WDIOF_POWEROVER                0x0040  /* Power over voltage */
+#define WDIOF_SETTIMEOUT       0x0080  /* Set timeout (in seconds) */
 #define        WDIOF_KEEPALIVEPING     0x8000  /* Keep alive ping reply */
 
 #define        WDIOS_DISABLECARD       0x0001  /* Turn off the watchdog timer */