From owner-cvs-all@FreeBSD.ORG  Tue Jan  3 16:43:35 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3ED9116A41F;
	Tue,  3 Jan 2006 16:43:35 +0000 (GMT)
	(envelope-from emaste@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DDBEB43D70;
	Tue,  3 Jan 2006 16:43:34 +0000 (GMT)
	(envelope-from emaste@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k03GhYx6089668;
	Tue, 3 Jan 2006 16:43:34 GMT
	(envelope-from emaste@repoman.freebsd.org)
Received: (from emaste@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k03GhYlt089667;
	Tue, 3 Jan 2006 16:43:34 GMT (envelope-from emaste)
Message-Id: <200601031643.k03GhYlt089667@repoman.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 3 Jan 2006 16:43:34 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/kern kern_clock.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2006 16:43:35 -0000

emaste      2006-01-03 16:43:34 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             kern_clock.c 
  Log:
  MFC kern_clock.c:1.181
    In watchdog_config enable the software watchdog iff the WD_ACTIVE flag
    is set.  When watchdogd(1) is terminated intentionally it clears the
    bit, which should then disable it in the kernel.
  
  PR:             kern/74386
  Submitted by:   Alex Hoff <ahoff at sandvine dot com>
  Approved by:    rwatson (mentor)
  
  Revision   Changes    Path
  1.178.2.2  +1 -2      src/sys/kern/kern_clock.c