Date: Sat, 3 Jul 2010 20:11:04 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209670 - head/sys/powerpc/powerpc Message-ID: <201007032011.o63KB4h2013217@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007032011.o63KB4h2013217>