From owner-svn-src-all@FreeBSD.ORG  Mon Jan 10 20:26:36 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD70E106564A;
	Mon, 10 Jan 2011 20:26:36 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AC6D78FC1A;
	Mon, 10 Jan 2011 20:26:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0AKQa8M092463;
	Mon, 10 Jan 2011 20:26:36 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0AKQaqG092461;
	Mon, 10 Jan 2011 20:26:36 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201101102026.p0AKQaqG092461@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 10 Jan 2011 20:26:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217236 - head/sys/dev/acpica/Osd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 10 Jan 2011 20:26:36 -0000

Author: jkim
Date: Mon Jan 10 20:26:36 2011
New Revision: 217236
URL: http://svn.freebsd.org/changeset/base/217236

Log:
  Prefer KASSERT(9) over panic(9) as it was never seen in reality.

Modified:
  head/sys/dev/acpica/Osd/OsdSchedule.c

Modified: head/sys/dev/acpica/Osd/OsdSchedule.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdSchedule.c	Mon Jan 10 19:59:20 2011	(r217235)
+++ head/sys/dev/acpica/Osd/OsdSchedule.c	Mon Jan 10 20:26:36 2011	(r217236)
@@ -245,8 +245,7 @@ AcpiOsGetTimer(void)
     UINT64 t;
 
     /* XXX During early boot there is no (decent) timer available yet. */
-    if (cold)
-	panic("acpi: timer op not yet supported during boot");
+    KASSERT(cold == 0, ("acpi: timer op not yet supported during boot"));
 
     binuptime(&bt);
     t = ((UINT64)10000000 * (uint32_t)(bt.frac >> 32)) >> 32;