From owner-p4-projects@FreeBSD.ORG  Mon Jan 30 19:21:12 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E29C1106567D; Mon, 30 Jan 2012 19:21:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AF2D1065674
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 19:21:11 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 77E0E8FC1C
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 19:21:11 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0UJLBtK089966
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 19:21:11 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0UJLBHV089962
	for perforce@freebsd.org; Mon, 30 Jan 2012 19:21:11 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 30 Jan 2012 19:21:11 GMT
Message-Id: <201201301921.q0UJLBHV089962@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 205419 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 30 Jan 2012 19:21:12 -0000

http://p4web.freebsd.org/@@205419?ac=10

Change 205419 by jhb@jhb_jhbbsd on 2012/01/30 19:20:17

	IFC @205414

Affected files ...

.. //depot/projects/multipass/sys/amd64/acpica/acpi_wakecode.S#4 integrate
.. //depot/projects/multipass/sys/amd64/amd64/mptable_pci.c#3 delete
.. //depot/projects/multipass/sys/i386/i386/mptable_pci.c#3 delete
.. //depot/projects/multipass/sys/isa/orm.c#3 delete

Differences ...

==== //depot/projects/multipass/sys/amd64/acpica/acpi_wakecode.S#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/acpica/acpi_wakecode.S,v 1.10 2012/01/21 17:45:27 kib Exp $
+ * $FreeBSD: src/sys/amd64/acpica/acpi_wakecode.S,v 1.11 2012/01/30 18:28:56 jkim Exp $
  */
 
 #include <machine/asmacros.h>
@@ -267,11 +267,11 @@
 	.quad	0
 wakeup_pcb:
 	.quad	0
+wakeup_fpusave:
+	.quad	0
 wakeup_gdt:
 	.word	0
 	.quad	0
-wakeup_fpusave:
-	.quad	0
 
 	ALIGN_DATA
 wakeup_efer: