From owner-p4-projects@FreeBSD.ORG  Thu Jun 30 04:27:38 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FC6516A420; Thu, 30 Jun 2005 04:27:38 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 34D2F16A41C
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 04:27:38 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C23B43D1D
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 04:27:38 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5U4Rbsm072615
	for <perforce@freebsd.org>; Thu, 30 Jun 2005 04:27:37 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5U4Rbk4072612
	for perforce@freebsd.org; Thu, 30 Jun 2005 04:27:37 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Jun 2005 04:27:37 GMT
Message-Id: <200506300427.j5U4Rbk4072612@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>
Cc: 
Subject: PERFORCE change 79232 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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 Jun 2005 04:27:39 -0000

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

Change 79232 by peter@peter_overcee on 2005/06/30 04:27:29

	Fix i386->amd64 merge error

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#27 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#27 (text+ko) ====

@@ -148,7 +148,7 @@
 	movq	lapic, %rdx
 	movl	$0, LA_EOI(%rdx)	/* End Of Interrupt to APIC */
 
-	FAKE_MCOUNT(TF_EIP(%esp))
+	FAKE_MCOUNT(TF_RIP(%rsp))
 
 	call	lapic_handle_timer
 	MEXITCOUNT