From c7c4bc64f2e3160c79115aae4ebc496d928ee8f7 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Sat, 3 Jul 2010 20:11:04 +0000 Subject: [PATCH] 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 --- sys/powerpc/powerpc/intr_machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index e48cd42f924..8c018c88225 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -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)); }