Module Name: src
Committed By: cliff
Date: Thu May 13 15:23:56 UTC 2010
Modified Files:
src/sys/dev/sysmon [matt-nb5-mips64]: sysmon_wdog.c
Log Message:
moveed callout_init call from sysmonopen_wdog to sysmon_wdog_init
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.28.1 src/sys/dev/sysmon/sysmon_wdog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_wdog.c
diff -u src/sys/dev/sysmon/sysmon_wdog.c:1.24 src/sys/dev/sysmon/sysmon_wdog.c:1.24.28.1
--- src/sys/dev/sysmon/sysmon_wdog.c:1.24 Sun Dec 16 21:07:45 2007
+++ src/sys/dev/sysmon/sysmon_wdog.c Thu May 13 15:23:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_wdog.c,v 1.24 2007/12/16 21:07:45 dyoung Exp $ */
+/* $NetBSD: sysmon_wdog.c,v 1.24.28.1 2010/05/13 15:23:56 cliff Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.24 2007/12/16 21:07:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.24.28.1 2010/05/13 15:23:56 cliff Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -78,6 +78,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);
}
/*
@@ -96,7 +97,6 @@
if (sysmon_wdog_sdhook == NULL)
printf("WARNING: unable to register watchdog "
"shutdown hook\n");
- callout_init(&sysmon_wdog_callout, 0);
}
mutex_exit(&sysmon_wdog_list_mtx);
