From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 14:29:43 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F31E16A4D0; Thu, 30 Oct 2003 14:29:43 -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 05C8916A4CE
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 14:29:43 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 16FD043FD7
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 14:29:42 -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 h9UMTfXJ079815
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 14:29:41 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UMTfk6079812
	for perforce@freebsd.org; Thu, 30 Oct 2003 14:29:41 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Oct 2003 14:29:41 -0800 (PST)
Message-Id: <200310302229.h9UMTfk6079812@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 40876 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 22:29:43 -0000

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

Change 40876 by peter@peter_daintree on 2003/10/30 14:29:27

	integrate -I smp_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#5 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#17 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#10 integrate

Differences ...

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

@@ -213,7 +213,7 @@
 	 * We map the XSDT and RSDT at page 1 in the crashdump area.
 	 * Page 0 is used to map in the headers of candidate ACPI tables.
 	 */
-	if (rsdp->Revision >= 2 /* && rsdp->RsdtPhysicalAddress == 0 */) {
+	if (rsdp->Revision >= 2) {
 		/* XXXTEST */
 		printf("XSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress);
 		xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG);

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#17 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.218 2003/10/24 21:02:26 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.219 2003/10/30 21:42:16 jhb Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"

==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#10 (text+ko) ====

@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.21 2003/10/01 23:46:08 peter Exp $
+ * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.22 2003/10/30 21:42:44 jhb Exp $
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */