From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 18:47:27 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DEA2F16A4D0; Tue, 11 Nov 2003 18:47:26 -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 B090E16A4CE
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 18:47:26 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3802043F3F
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 18:47:26 -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 hAC2lQXJ027835
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 18:47:26 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC2lP3S027832
	for perforce@freebsd.org; Tue, 11 Nov 2003 18:47:25 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 11 Nov 2003 18:47:25 -0800 (PST)
Message-Id: <200311120247.hAC2lP3S027832@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 42074 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: Wed, 12 Nov 2003 02:47:27 -0000

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

Change 42074 by peter@peter_daintree on 2003/11/11 18:46:38

	fix up merge problems.

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#3 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#3 (text+ko) ====

@@ -100,9 +100,8 @@
 	movq	PCPU(CURTHREAD),%rbx ;					\
 	incl	TD_INTR_NESTING_LEVEL(%rbx) ;				\
 	FAKE_MCOUNT(13*4(%esp)) ;	/* XXX late to avoid double count */ \
-	pushq	$irq_num; 	/* pass the IRQ */			\
+	movq	$irq_num, %rdi; 	/* pass the IRQ */		\
 	call	atpic_sched_ithd ;					\
-	addq	$8, %rsp ;	/* discard the parameter */		\
 	decl	TD_INTR_NESTING_LEVEL(%rbx) ;				\
 	MEXITCOUNT ;							\
 	jmp	doreti