From owner-cvs-src-old@FreeBSD.ORG  Sat May 15 10:31:23 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6818F10657CD
	for <cvs-src-old@freebsd.org>; Sat, 15 May 2010 10:31:23 +0000 (UTC)
	(envelope-from phk@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 562818FC1C
	for <cvs-src-old@freebsd.org>; Sat, 15 May 2010 10:31:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4FAVNl0075798
	for <cvs-src-old@freebsd.org>; Sat, 15 May 2010 10:31:23 GMT
	(envelope-from phk@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4FAVNwp075797
	for cvs-src-old@freebsd.org; Sat, 15 May 2010 10:31:23 GMT
	(envelope-from phk@repoman.freebsd.org)
Message-Id: <201005151031.o4FAVNwp075797@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	phk@repoman.freebsd.org using -f
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 15 May 2010 10:31:11 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/i386/i386 geode.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 May 2010 10:31:23 -0000

phk         2010-05-15 10:31:11 UTC

  FreeBSD src repository

  Modified files:
    sys/i386/i386        geode.c 
  Log:
  SVN rev 208111 on 2010-05-15 10:31:11Z by phk
  
  Apply a patch that has been lingering in my inbox for far too long:
  
  On a soekris Net5501, if you do a watchdog -t 16, followed by a watchdog
  -t 0 to disable the watchdog, and then after some time (16s) re-enable
  the watchdog the box reboots immediatly. This prevents also to stop and
  restart watchdogd(8).
  
  This is because when you stop the watchdog, the timer is not stoped,
  only the hard reset is disabled. So when the timer has elapsed, the C2
  event of the timer is set.
  
  But when the hard reset is re-enabled, the event is not cleared and the
  box reboots.
  
  The attached patch stops and resets the counter when the watchdog is
  disabled and do not disable the hard reset of the timer (if the timer
  has elapsed it's too late).
  
  Submitted by:    Patrick Lamaizière
  
  Revision  Changes    Path
  1.12      +13 -4     src/sys/i386/i386/geode.c