svn commit: r248230 - head/sys/kern

[Alexander Motin]

Author: mav
Date: Wed Mar 13 06:42:01 2013
New Revision: 248230
URL: http://svnweb.freebsd.org/changeset/base/248230

Log:
  Fix incorrect assertion that caused panic when periodic-only timers used.

Modified:
  head/sys/kern/kern_et.c

Modified: head/sys/kern/kern_et.c
==============================================================================
--- head/sys/kern/kern_et.c	Wed Mar 13 03:27:32 2013	(r248229)
+++ head/sys/kern/kern_et.c	Wed Mar 13 06:42:01 2013	(r248230)
@@ -168,7 +168,7 @@ et_start(struct eventtimer *et, sbintime
 	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)