Date: Fri, 14 Nov 2003 08:51:21 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42336 for review Message-ID: <200311141651.hAEGpL2Q049711@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42336 Change 42336 by peter@peter_overcee on 2003/11/14 08:51:01 integrate -b smp_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#11 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#5 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.92 2003/11/12 18:13:57 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.93 2003/11/13 18:16:37 jhb Exp $ */ /* @@ -134,11 +134,11 @@ iretq MCOUNT_LABEL(bintr2) - ISR_VEC(1,apic_isr1) - ISR_VEC(2,apic_isr2) - ISR_VEC(3,apic_isr3) - ISR_VEC(4,apic_isr4) - ISR_VEC(5,apic_isr5) + ISR_VEC(1, apic_isr1) + ISR_VEC(2, apic_isr2) + ISR_VEC(3, apic_isr3) + ISR_VEC(4, apic_isr4) + ISR_VEC(5, apic_isr5) MCOUNT_LABEL(eintr2) #ifdef SMP ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#11 (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/i386/include/apicvar.h,v 1.2 2003/11/12 18:13:57 jhb Exp $ + * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.3 2003/11/13 16:41:07 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -42,7 +42,7 @@ * Layout of local APIC interrupt vectors: * * 0xff (255) +-------------+ - * | | 15 (Spurios Vector) + * | | 15 (Spurious Vector) * 0xf0 (240) +-------------+ * | | 14 (Interprocessor Interrupts) * 0xe0 (224) +-------------+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311141651.hAEGpL2Q049711>