Date: Tue, 11 Nov 2003 18:47:25 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42074 for review Message-ID: <200311120247.hAC2lP3S027832@repoman.freebsd.org>
index | next in thread | raw e-mail
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 doretihelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311120247.hAC2lP3S027832>