Author: mav
Date: Sun Jun 20 10:23:46 2010
New Revision: 209365
URL: http://svn.freebsd.org/changeset/base/209365
Log:
MFC r209155:
Fix bug introduced in SVN rev 194985. When calling pic_assign_cpu()
for pre-bound IRQs during boot, submit there LAPIC ID, same as in other
places, not CPU ID.
Modified:
stable/8/sys/amd64/amd64/intr_machdep.c
stable/8/sys/i386/i386/intr_machdep.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/ixgbe/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/intr_machdep.c Sun Jun 20 09:40:54 2010
(r209364)
+++ stable/8/sys/amd64/amd64/intr_machdep.c Sun Jun 20 10:23:46 2010
(r209365)
@@ -529,7 +529,7 @@ intr_shuffle_irqs(void *arg __unused)
*/
if (isrc->is_event->ie_cpu != NOCPU)
(void)isrc->is_pic->pic_assign_cpu(isrc,
- isrc->is_event->ie_cpu);
+ cpu_apic_ids[isrc->is_event->ie_cpu]);
else if (isrc->is_pic->pic_assign_cpu(isrc,
cpu_apic_ids[current_cpu]) == 0)
(void)intr_next_cpu();
Modified: stable/8/sys/i386/i386/intr_machdep.c
==============================================================================
--- stable/8/sys/i386/i386/intr_machdep.c Sun Jun 20 09:40:54 2010
(r209364)
+++ stable/8/sys/i386/i386/intr_machdep.c Sun Jun 20 10:23:46 2010
(r209365)
@@ -502,7 +502,7 @@ intr_shuffle_irqs(void *arg __unused)
*/
if (isrc->is_event->ie_cpu != NOCPU)
(void)isrc->is_pic->pic_assign_cpu(isrc,
- isrc->is_event->ie_cpu);
+ cpu_apic_ids[isrc->is_event->ie_cpu]);
else if (isrc->is_pic->pic_assign_cpu(isrc,
cpu_apic_ids[current_cpu]) == 0)
(void)intr_next_cpu();
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
