From owner-svn-src-projects@FreeBSD.ORG  Thu Aug  5 11:15:53 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A4541065672;
	Thu,  5 Aug 2010 11:15:53 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38E988FC15;
	Thu,  5 Aug 2010 11:15:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o75BFraO073169;
	Thu, 5 Aug 2010 11:15:53 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o75BFriU073167;
	Thu, 5 Aug 2010 11:15:53 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008051115.o75BFriU073167@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 5 Aug 2010 11:15:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210858 - projects/sv/sys/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Aug 2010 11:15:53 -0000

Author: attilio
Date: Thu Aug  5 11:15:52 2010
New Revision: 210858
URL: http://svn.freebsd.org/changeset/base/210858

Log:
  More watchdog cleanup.

Modified:
  projects/sv/sys/net/netdump_client.c

Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c	Thu Aug  5 11:12:53 2010	(r210857)
+++ projects/sv/sys/net/netdump_client.c	Thu Aug  5 11:15:52 2010	(r210858)
@@ -305,10 +305,6 @@ sysctl_force_crash(SYSCTL_HANDLER_ARGS) 
 			printf("\nPanic'ing system...\n");
 			panic("netdump forced crash");
 			break;
-		case 4:
-			printf("\nStarting netdump then spinning "
-				"(to test watchdog trigger)\n");
-			// nd_force_crash == 4 is checked in netdump_dumper
 		case 3:
 			printf("\nDeadlocking system while holding the em lock\n");
 			{
@@ -1067,11 +1063,6 @@ netdump_dumper(void *priv, void *virtual
 		return err;
 	}
 	
-	/* To test the hardware watchdog for problems during dumps, spin here
-	 * if required */
-	if (nd_force_crash == 4)
-		for(;;);
-
 	return 0;
 }