aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2013-03-13 06:42:01 +0000
committerAlexander Motin <mav@FreeBSD.org>2013-03-13 06:42:01 +0000
commitca9feb490c23706826f0937fb7d6bdc0012a05ea (patch)
tree91781b8bf2fbb65f27218a837e55d284e4e7a7ec
parent3c2a957d2d38dcc9d72fed5d50bdaaeaa40f27cd (diff)
downloadsrc-ca9feb490c23706826f0937fb7d6bdc0012a05ea.tar.gz
src-ca9feb490c23706826f0937fb7d6bdc0012a05ea.zip
Fix incorrect assertion that caused panic when periodic-only timers used.
Notes
Notes: svn path=/head/; revision=248230
-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 472db79e9d59..d07316cf853d 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)