summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2006-11-26 11:21:56 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2006-11-26 11:21:56 +0000
commit9803ce3cb86480ff23d56277964211ae014fd505 (patch)
tree0f11458073d52b42e9f6305f263761add54fe9a7
parente115367249d5f4d701a65023d2a9e011c19912bb (diff)
use splclock() instead of splsoftclock() when setting the timeout period
from the watchdog framework; this is consistent with other watchdogs we have. discussed with and ok dlg
-rw-r--r--sys/arch/i386/i386/esm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c
index ca5fc2971ea..550b017a4de 100644
--- a/sys/arch/i386/i386/esm.c
+++ b/sys/arch/i386/i386/esm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esm.c,v 1.42 2006/05/11 13:21:11 mickey Exp $ */
+/* $OpenBSD: esm.c,v 1.43 2006/11/26 11:21:55 mbalmer Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -281,7 +281,7 @@ esm_watchdog(void *arg, int period)
if (sc->sc_wdog_period == period) {
if (period != 0) {
- s = splsoftclock();
+ s = splclock();
if (sc->sc_step != 0) {
/* defer tickling to the sensor refresh */
sc->sc_wdog_tickle = 1;
@@ -302,7 +302,7 @@ esm_watchdog(void *arg, int period)
if (period < 10 && period > 0)
period = 10;
- s = splsoftclock();
+ s = splclock();
prop.cmd = ESM2_CMD_HWDC;
prop.subcmd = ESM2_HWDC_WRITE_PROPERTY;