PERFORCE change 42074 for review

[Peter Wemm]

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

Change 42074 by peter at 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