From owner-svn-src-all@FreeBSD.ORG  Sat Jul  3 20:11:05 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CAE8C106566B;
	Sat,  3 Jul 2010 20:11:04 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B9ABD8FC17;
	Sat,  3 Jul 2010 20:11:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o63KB4fu013219;
	Sat, 3 Jul 2010 20:11:04 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o63KB4h2013217;
	Sat, 3 Jul 2010 20:11:04 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007032011.o63KB4h2013217@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 3 Jul 2010 20:11:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209670 - head/sys/powerpc/powerpc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jul 2010 20:11:05 -0000

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));
 }