aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/watchdog.h
diff options
context:
space:
mode:
authorNick Hibma <n_hibma@FreeBSD.org>2006-12-15 21:44:49 +0000
committerNick Hibma <n_hibma@FreeBSD.org>2006-12-15 21:44:49 +0000
commit9079fff5504650793319895e16f3f9cd431c5ec5 (patch)
tree787bbfce7ce18dfa578e01e209a342d73f933983 /sys/sys/watchdog.h
parent2cd19db26a49002206f71dfa91a0278aa7b43977 (diff)
downloadsrc-9079fff5504650793319895e16f3f9cd431c5ec5.tar.gz
src-9079fff5504650793319895e16f3f9cd431c5ec5.zip
Align the interfaces for the various watchdogs and make the interface
behave as expected. Also: - Return an error if WD_PASSIVE is passed in to the ioctl as only WD_ACTIVE is implemented at the moment. See sys/watchdog.h for an explanation of the difference between WD_ACTIVE and WD_PASSIVE. - Remove the I_HAVE_TOTALLY_LOST_MY_SENSE_OF_HUMOR define. If you've lost your sense of humor, than don't add a define. Specific changes: i80321_wdog.c Don't roll your own passive watchdog tickle as this would defeat the purpose of an active (userland) watchdog tickle. ichwd.c / ipmi.c: WD_ACTIVE means active patting of the watchdog by a userland process, not whether the watchdog is active. See sys/watchdog.h. kern_clock.c: (software watchdog) Remove a check for WD_ACTIVE as this does not make sense here. This reverts r1.181.
Notes
Notes: svn path=/head/; revision=165260
Diffstat (limited to 'sys/sys/watchdog.h')
-rw-r--r--sys/sys/watchdog.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h
index a67b68b4392d..941077593384 100644
--- a/sys/sys/watchdog.h
+++ b/sys/sys/watchdog.h
@@ -30,11 +30,7 @@
#include <sys/ioccom.h>
-#ifdef I_HAVE_TOTALLY_LOST_MY_SENSE_OF_HUMOUR
-#define _PATH_WATCHDOG "watchdog"
-#else
#define _PATH_WATCHDOG "fido"
-#endif
#define WDIOCPATPAT _IOW('W', 42, u_int)