svn commit: r209670 - head/sys/powerpc/powerpc

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Jul  3 20:11:04 2010
New Revision: 209670
URL: http://svn.freebsd.org/changeset/base/209670

Log:
  Add a missing conditional. We should not bind the PIC interrupt unless
  the interrupt's PIC (a) exists and (b) is the root PIC.
  
  Reported by:	Andreas Tobler

Modified:
  head/sys/powerpc/powerpc/intr_machdep.c

Modified: head/sys/powerpc/powerpc/intr_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/intr_machdep.c	Sat Jul  3 18:25:37 2010	(r209669)
+++ head/sys/powerpc/powerpc/intr_machdep.c	Sat Jul  3 20:11:04 2010	(r209670)
@@ -415,7 +415,8 @@ powerpc_bind_intr(u_int irq, u_char cpu)
 	else
 		i->cpu = 1 << cpu;
 
-	PIC_BIND(i->pic, i->intline, i->cpu);
+	if (!cold && i->pic != NULL && i->pic == root_pic)
+		PIC_BIND(i->pic, i->intline, i->cpu);
 
 	return (intr_event_bind(i->event, cpu));
 }