From owner-p4-projects@FreeBSD.ORG  Sun Nov 16 13:37:41 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9987916A4D0; Sun, 16 Nov 2003 13:37:41 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 748AC16A4CE
	for <perforce@freebsd.org>; Sun, 16 Nov 2003 13:37:41 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CD00143FBF
	for <perforce@freebsd.org>; Sun, 16 Nov 2003 13:37:40 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAGLbeXJ021564
	for <perforce@freebsd.org>; Sun, 16 Nov 2003 13:37:40 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAGLbe1w021561
	for perforce@freebsd.org; Sun, 16 Nov 2003 13:37:40 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sun, 16 Nov 2003 13:37:40 -0800 (PST)
Message-Id: <200311162137.hAGLbe1w021561@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42572 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Nov 2003 21:37:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=42572

Change 42572 by peter@peter_overcee on 2003/11/16 13:37:21

	allow lapic_id() to be called before everything is up and running.
	this is needed for the ktr hack
	note to self: DO NOT COMMIT THIS!

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#22 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#22 (text+ko) ====

@@ -304,7 +304,12 @@
 lapic_id(void)
 {
 
+#if 0
 	KASSERT(lapic != NULL, ("local APIC is not mapped"));
+#else
+	if (lapic == 0)
+		return 0;
+#endif
 	return (lapic->id >> APIC_ID_SHIFT);
 }