[src/trunk]: src/sys/dev/sysmon Move callout_init to wdog_preinit

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

details:   https://anonhg.NetBSD.org/src/rev/0562e508f750
branches:  trunk
changeset: 338702:0562e508f750
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 05 00:53:47 2015 +0000

description:
Move callout_init to wdog_preinit

diffstat:

 sys/dev/sysmon/sysmon_wdog.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 4c1fdc636397 -r 0562e508f750 sys/dev/sysmon/sysmon_wdog.c
--- a/sys/dev/sysmon/sysmon_wdog.c      Thu Jun 04 22:44:43 2015 +0000
+++ b/sys/dev/sysmon/sysmon_wdog.c      Fri Jun 05 00:53:47 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysmon_wdog.c,v 1.27 2015/04/25 23:40:09 pgoyette Exp $        */
+/*     $NetBSD: sysmon_wdog.c,v 1.28 2015/06/05 00:53:47 matt Exp $    */
 
 /*-
  * Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.27 2015/04/25 23:40:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.28 2015/06/05 00:53:47 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -92,6 +92,7 @@
        mutex_init(&sysmon_wdog_list_mtx, MUTEX_DEFAULT, IPL_NONE);
        mutex_init(&sysmon_wdog_mtx, MUTEX_DEFAULT, IPL_SOFTCLOCK);
        cv_init(&sysmon_wdog_cv, "wdogref");
+       callout_init(&sysmon_wdog_callout, 0);
 
        return 0;
 }
@@ -109,7 +110,6 @@
        sysmon_wdog_cphook = critpollhook_establish(sysmon_wdog_critpoll, NULL);
        if (sysmon_wdog_cphook == NULL)
                printf("WARNING: unable to register watchdog critpoll hook\n");
-       callout_init(&sysmon_wdog_callout, 0);
 
        error = sysmon_attach_minor(SYSMON_MINOR_WDOG, &sysmon_wdog_opvec);