From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 15:56:12 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E1F116A4E8; Thu, 30 Oct 2003 15:56:12 -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 F25F516A4CF
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:56:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9DBED43F93
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:56:10 -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 h9UNuAXJ087334
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:56:10 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNuAN5087331
	for perforce@freebsd.org; Thu, 30 Oct 2003 15:56:10 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Oct 2003 15:56:10 -0800 (PST)
Message-Id: <200310302356.h9UNuAN5087331@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 40901 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: Thu, 30 Oct 2003 23:56:13 -0000

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

Change 40901 by peter@peter_daintree on 2003/10/30 15:56:08

	compile hacks. KERNLOAD doesn't exist here since we have dmap.  I need
	to fix this properly.

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#7 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/madt.c#7 (text+ko) ====

@@ -200,7 +200,9 @@
 	    (void *)rsdp_ptr.Pointer.Logical);
 	printf("rsdp_ptr.Pointer.Physical = 0x%jx\n",
 	    (uintmax_t)rsdp_ptr.Pointer.Physical);
+#ifdef __i386__
 	KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high"));
+#endif
 	rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR));
 	if (rsdp == NULL) {
 		if (bootverbose)
@@ -422,7 +424,7 @@
 		if (bootverbose)
 			printf("MADT: Found IO APIC ID %d, Vector %d at %p\n",
 			    apic->IoApicId, apic->Vector,
-			    (void *)apic->IoApicAddress);
+			    (void *)(uintptr_t)apic->IoApicAddress);
 		if (apic->IoApicId >= NIOAPICS)
 			panic("%s: I/O APIC ID %d too high", __func__,
 			    apic->IoApicId);