summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2013-03-13 06:42:01 +0000
committermav <mav@FreeBSD.org>2013-03-13 06:42:01 +0000
commit06e9d2ec10271583cf18d3254fcbe6aa782acc1f (patch)
tree91781b8bf2fbb65f27218a837e55d284e4e7a7ec
parent9141c87f459f9a69d0f03ebb109f534d019267c5 (diff)
downloadFreeBSD-src-06e9d2ec10271583cf18d3254fcbe6aa782acc1f.zip
FreeBSD-src-06e9d2ec10271583cf18d3254fcbe6aa782acc1f.tar.gz
Fix incorrect assertion that caused panic when periodic-only timers used.
-rw-r--r--sys/kern/kern_et.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_et.c b/sys/kern/kern_et.c
index 472db79..d07316c 100644
--- a/sys/kern/kern_et.c
+++ b/sys/kern/kern_et.c
@@ -168,7 +168,7 @@ et_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
KASSERT(period >= 0, ("et_start: negative period"));
KASSERT((et->et_flags & ET_FLAGS_PERIODIC) || period == 0,
("et_start: period specified for oneshot-only timer"));
- KASSERT((et->et_flags & ET_FLAGS_ONESHOT) && period == 0,
+ KASSERT((et->et_flags & ET_FLAGS_ONESHOT) || period != 0,
("et_start: period not specified for periodic-only timer"));
if (period != 0) {
if (period < et->et_min_period)
OpenPOWER on IntegriCloud