diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 4570ed23b2fa..9b7084abc813 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -29,10 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#ifdef _KERNEL -#include "opt_hw_wdog.h" -#endif /* _KERNEL */ - #include #ifdef _KERNEL diff --git a/sys/conf/options b/sys/conf/options index 2ef8b20b1211..28c9e5c728e9 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -85,7 +85,6 @@ GEOM_STRIPE opt_geom.h GEOM_SUNLABEL opt_geom.h GEOM_UZIP opt_geom.h GEOM_VOL opt_geom.h -HW_WDOG KSTACK_MAX_PAGES KSTACK_PAGES KTRACE diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index c63c586ff753..a720becb7e13 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdb.h" -#include "opt_hw_wdog.h" #include "opt_mac.h" #include "opt_panic.h" #include "opt_show_busybufs.h" @@ -104,17 +103,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. diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile index fdb9986a668f..10e942d52281 100644 --- a/sys/modules/cam/Makefile +++ b/sys/modules/cam/Makefile @@ -11,7 +11,6 @@ KMOD= cam SRCS= opt_cam.h SRCS+= opt_scsi.h SRCS+= opt_cd.h -SRCS+= opt_hw_wdog.h SRCS+= opt_pt.h SRCS+= opt_sa.h SRCS+= opt_ses.h diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 2a8cb29e81c7..6e366946a972 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -54,8 +54,6 @@ #if NWDC > 0 -#include "opt_hw_wdog.h" - #include #include #include