[src/trunk]: src Make swwdog use no-needs-count. As the manpage says, there ...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c424d9e4bec
branches:  trunk
changeset: 751270:7c424d9e4bec
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Jan 30 21:55:28 2010 +0000

description:
Make swwdog use no-needs-count.  As the manpage says, there can be only one.

diffstat:

 share/man/man4/swwdog.4     |  11 ++++-------
 sys/dev/sysmon/files.sysmon |   5 ++---
 sys/dev/sysmon/swwdog.c     |   7 +++----
 3 files changed, 9 insertions(+), 14 deletions(-)

diffs (83 lines):

diff -r c98322809e80 -r 7c424d9e4bec share/man/man4/swwdog.4
--- a/share/man/man4/swwdog.4   Sat Jan 30 21:48:30 2010 +0000
+++ b/share/man/man4/swwdog.4   Sat Jan 30 21:55:28 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: swwdog.4,v 1.3 2005/01/12 15:16:33 drochner Exp $
+.\"    $NetBSD: swwdog.4,v 1.4 2010/01/30 21:55:28 pooka Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Steven M. Bellovin
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 6, 2005
+.Dd January 30, 2010
 .\" Written by Steven M. Bellovin
 .Dt SWWDOG 4
 .Os
@@ -39,7 +39,7 @@
 .Nm swwdog
 .Nd software watchdog timer
 .Sh SYNOPSIS
-.Cd "pseudo-device swwdog" Op Ar count
+.Cd "pseudo-device swwdog"
 .Sh DESCRIPTION
 The
 .Nm
@@ -60,10 +60,7 @@
 driver was written by
 .An Steven M. Bellovin .
 .Sh BUGS
-Although more than one
-.Nm
-timer can be configured, it's a pointless thing to do, since only
-one watchdog timer can be active at any given time.
+Only one watchdog timer can be active at any given time.
 Arguably, this is a bug in the watchdog timer framework.
 .Pp
 Kernel tickle mode is useless with
diff -r c98322809e80 -r 7c424d9e4bec sys/dev/sysmon/files.sysmon
--- a/sys/dev/sysmon/files.sysmon       Sat Jan 30 21:48:30 2010 +0000
+++ b/sys/dev/sysmon/files.sysmon       Sat Jan 30 21:55:28 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sysmon,v 1.10 2007/09/04 16:54:02 xtraeme Exp $
+#      $NetBSD: files.sysmon,v 1.11 2010/01/30 21:55:28 pooka Exp $
 
 define sysmon_taskq
 file   dev/sysmon/sysmon_taskq.c       sysmon_taskq            needs-flag
@@ -19,5 +19,4 @@
                                        sysmon_power
 
 defpseudo swwdog: sysmon_wdog
-file    dev/sysmon/swwdog.c            swwdog                needs-count
-
+file    dev/sysmon/swwdog.c            swwdog
diff -r c98322809e80 -r 7c424d9e4bec sys/dev/sysmon/swwdog.c
--- a/sys/dev/sysmon/swwdog.c   Sat Jan 30 21:48:30 2010 +0000
+++ b/sys/dev/sysmon/swwdog.c   Sat Jan 30 21:55:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: swwdog.c,v 1.7 2007/07/09 21:01:23 ad Exp $    */
+/*     $NetBSD: swwdog.c,v 1.8 2010/01/30 21:55:30 pooka Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.7 2007/07/09 21:01:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.8 2010/01/30 21:55:30 pooka Exp $");
 
 /*
  *
@@ -49,8 +49,7 @@
 #include <sys/wdog.h>
 #include <dev/sysmon/sysmonvar.h>
 
-#include "swwdog.h"
-
+#define NSWWDOG 1
 struct swwdog_softc {
        struct sysmon_wdog sc_smw;
        struct callout sc_c;