svn commit: r209155 - in head/sys: amd64/amd64 i386/i386

[Alexander Motin]

Author: mav
Date: Mon Jun 14 07:38:53 2010
New Revision: 209155
URL: http://svn.freebsd.org/changeset/base/209155

Log:
  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:
  head/sys/amd64/amd64/intr_machdep.c
  head/sys/i386/i386/intr_machdep.c

Modified: head/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- head/sys/amd64/amd64/intr_machdep.c	Mon Jun 14 07:10:37 2010	(r209154)
+++ head/sys/amd64/amd64/intr_machdep.c	Mon Jun 14 07:38:53 2010	(r209155)
@@ -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: head/sys/i386/i386/intr_machdep.c
==============================================================================
--- head/sys/i386/i386/intr_machdep.c	Mon Jun 14 07:10:37 2010	(r209154)
+++ head/sys/i386/i386/intr_machdep.c	Mon Jun 14 07:38:53 2010	(r209155)
@@ -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();