From 6d488cc32884ed6ffc6c977f470b8ddcd77cb482 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 3 May 2012 23:02:27 +0200
Subject: [PATCH] kernel: Remove the unused HW_WDOG option.

---
 UPDATING                 |  6 +++---
 sys/conf/options         |  1 -
 sys/config/LINT          |  6 ------
 sys/config/LINT64        |  6 ------
 sys/kern/kern_shutdown.c | 12 ------------
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/UPDATING b/UPDATING
index 6d3f5839bb..c20d5dcd96 100644
--- a/UPDATING
+++ b/UPDATING
@@ -20,11 +20,11 @@ effect for a while. The hw.ioapic_enable tunable now serves its purpose.
 If you have 'options APIC_IO' in your kernel config, you'll have to
 remove it.
 
-WATCHDOG_ENABLE OPTION REMOVED
-------------------------------
+WATCHDOG_ENABLE & HW_WDOG OPTIONS REMOVED
+-----------------------------------------
 
 The wdog framework is now compiled into our kernels by default, so the
-option is no longer needed.
+options are no longer needed.
 
 +-----------------------------------------------------------------------+
 +         UPGRADING DRAGONFLY FROM 2.10 to later versions               +
diff --git a/sys/conf/options b/sys/conf/options
index 341eef0858..3a5f2b4d64 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -81,7 +81,6 @@ DDB
 DDB_TRACE
 DDB_UNATTENDED	opt_ddb.h
 GDB_REMOTE_CHAT	opt_ddb.h
-HW_WDOG
 KTRACE
 LIBICONV
 MD_NSECT	opt_md.h
diff --git a/sys/config/LINT b/sys/config/LINT
index 79cba2a285..950a55a905 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2069,12 +2069,6 @@ options 	BOOTP_NFSV3	# Use NFS v3 to NFS mount root
 options 	BOOTP_COMPAT	# Workaround for broken bootp daemons.
 options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 
-#
-# Add tie-ins for a hardware watchdog.  This only enable the hooks;
-# the user must still supply the actual driver.
-#
-options 	HW_WDOG
-
 #
 # Set the number of PV entries per process.  Increasing this can
 # stop panics related to heavy use of shared memory. However, that can
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 81b7abd925..5c8adbff19 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -1845,12 +1845,6 @@ options 	BOOTP_NFSV3	# Use NFS v3 to NFS mount root
 options 	BOOTP_COMPAT	# Workaround for broken bootp daemons.
 options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 
-#
-# Add tie-ins for a hardware watchdog.  This only enable the hooks;
-# the user must still supply the actual driver.
-#
-options 	HW_WDOG
-
 #
 # Set the number of PV entries per process.  Increasing this can
 # stop panics related to heavy use of shared memory. However, that can
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index fa69d1c5f2..25f7372c39 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -41,7 +41,6 @@
 
 #include "opt_ddb.h"
 #include "opt_ddb_trace.h"
-#include "opt_hw_wdog.h"
 #include "opt_panic.h"
 #include "opt_show_busybufs.h"
 #include "use_gpio.h"
@@ -127,17 +126,6 @@ SYSCTL_INT(_kern, OID_AUTO, sync_on_panic, CTLFLAG_RW,
 
 SYSCTL_NODE(_kern, OID_AUTO, shutdown, CTLFLAG_RW, 0, "Shutdown environment");
 
-#ifdef	HW_WDOG
-/*
- * If there is a hardware watchdog, point this at the function needed to
- * hold it off.
- * It's needed when the kernel needs to do some lengthy operations.
- * e.g. in wd.c when dumping core.. It's most annoying to have
- * your precious core-dump only half written because the wdog kicked in.
- */
-watchdog_tickle_fn wdog_tickler = NULL;
-#endif	/* HW_WDOG */
-
 /*
  * Variable panicstr contains argument to first call to panic; used as flag
  * to indicate that the kernel has already called panic.
-- 
2.41.0