Date: Sun, 1 May 2005 02:58:27 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76313 for review Message-ID: <200505010258.j412wR1k012473@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=76313 Change 76313 by peter@peter_daintree on 2005/05/01 02:57:43 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#49 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#91 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#59 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#71 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#66 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#25 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#49 (text+ko) ==== @@ -109,7 +109,7 @@ { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* PMC */ + { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */ }; @@ -302,6 +302,11 @@ /* Program LINT[01] LVT entries. */ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); +#ifdef HWPMC_HOOKS + /* Program the PMC LVT entry if present. */ + if (maxlvt >= LVT_PMC) + lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint); +#endif /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#91 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.S#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#59 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#71 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#66 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1193) +# (XXX from i386:NOTES,v 1.1198) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.34 2005/04/30 20:00:58 dwhite Exp $ # ==== //depot/projects/hammer/sys/amd64/include/bus.h#11 (text+ko) ==== @@ -122,9 +122,6 @@ #define AMD64_BUS_SPACE_IO 0 /* space is i/o space */ #define AMD64_BUS_SPACE_MEM 1 /* space is mem space */ -/* - * Bus address and size types - */ #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF #define BUS_SPACE_MAXSIZE 0xFFFFFFFF ==== //depot/projects/hammer/sys/amd64/include/smp.h#25 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505010258.j412wR1k012473>