svn commit: r225796 - stable/8/sys/kern

[Attilio Rao]

Author: attilio
Date: Tue Sep 27 13:50:30 2011
New Revision: 225796
URL: http://svn.freebsd.org/changeset/base/225796

Log:
  MFC r225794:
  Backout r225372 MFC.

Modified:
  stable/8/sys/kern/subr_kdb.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/subr_kdb.c
==============================================================================
--- stable/8/sys/kern/subr_kdb.c	Tue Sep 27 13:47:23 2011	(r225795)
+++ stable/8/sys/kern/subr_kdb.c	Tue Sep 27 13:50:30 2011	(r225796)
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_kdb.h"
 #include "opt_stack.h"
-#include "opt_watchdog.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,9 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/smp.h>
 #include <sys/stack.h>
 #include <sys/sysctl.h>
-#ifdef SW_WATCHDOG
-#include <sys/watchdog.h>
-#endif
 
 #include <machine/kdb.h>
 #include <machine/pcb.h>
@@ -517,9 +513,6 @@ int
 kdb_trap(int type, int code, struct trapframe *tf)
 {
 	struct kdb_dbbe *be;
-#ifdef SW_WATCHDOG
-	u_int wdoglvt;
-#endif
 	register_t intr;
 #ifdef SMP
 	int did_stop_cpus;
@@ -536,10 +529,6 @@ kdb_trap(int type, int code, struct trap
 
 	intr = intr_disable();
 
-#ifdef SW_WATCHDOG
-	wdoglvt = wdog_kern_last_timeout();
-	wdog_kern_pat(WD_TO_NEVER);
-#endif
 #ifdef SMP
 	if ((did_stop_cpus = kdb_stop_cpus) != 0)
 		stop_cpus_hard(PCPU_GET(other_cpus));
@@ -571,9 +560,6 @@ kdb_trap(int type, int code, struct trap
 	if (did_stop_cpus)
 		restart_cpus(stopped_cpus);
 #endif
-#ifdef SW_WATCHDOG
-	wdog_kern_pat(wdoglvt);
-#endif
 
 	intr_restore(intr);