[PATCH] add missing watchdog COMPATIBLE_IOCTLs

[PATCH] add missing watchdog COMPATIBLE_IOCTLs

[Arnd Bergmann]

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>

diff -u -r1.15 compat_ioctl.h
--- ./include/linux/compat_ioctl.h	16 Jun 2004 14:34:50 -0000	1.15
+++ ./include/linux/compat_ioctl.h	3 Aug 2004 15:47:03 -0000
@@ -593,12 +593,14 @@
 COMPATIBLE_IOCTL(ATMMPC_CTRL)
 COMPATIBLE_IOCTL(ATMMPC_DATA)
 /* Big W */
-/* WIOC_GETSUPPORT not yet implemented -E */
+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)

Re: [PATCH] add missing watchdog COMPATIBLE_IOCTLs

[Wim Van Sebroeck]

Hi Arnd,

> 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.

This is indeed correct. We should add them. I can't test it myself because
I have no 64 bit system...

Anyway: I included it in "my watchdog tree" so that it can be merged into
the kernel.

Thanks,
Wim.