From owner-svn-src-all@FreeBSD.ORG  Wed Mar 13 06:42:02 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 47B16F66;
 Wed, 13 Mar 2013 06:42:02 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 303C2689;
 Wed, 13 Mar 2013 06:42:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2D6g2eL009486;
 Wed, 13 Mar 2013 06:42:02 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2D6g2JL009485;
 Wed, 13 Mar 2013 06:42:02 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201303130642.r2D6g2JL009485@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 13 Mar 2013 06:42:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248230 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Mar 2013 06:42:02 -0000

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)