From owner-svn-src-all@FreeBSD.ORG  Tue Jul  6 15:38:38 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 977861065670;
	Tue,  6 Jul 2010 15:38:38 +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 8528E8FC16;
	Tue,  6 Jul 2010 15:38:38 +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 o66Fcc7o011239;
	Tue, 6 Jul 2010 15:38:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o66Fcc3o011237;
	Tue, 6 Jul 2010 15:38:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007061538.o66Fcc3o011237@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 6 Jul 2010 15:38:38 +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: r209726 - 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: Tue, 06 Jul 2010 15:38:38 -0000

Author: nwhitehorn
Date: Tue Jul  6 15:38:38 2010
New Revision: 209726
URL: http://svn.freebsd.org/changeset/base/209726

Log:
  It does not actually make sense to provide an IPI facility on non-root
  PICs, so replace cpuid logic with an assert.

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

Modified: head/sys/powerpc/powerpc/openpic.c
==============================================================================
--- head/sys/powerpc/powerpc/openpic.c	Tue Jul  6 15:31:58 2010	(r209725)
+++ head/sys/powerpc/powerpc/openpic.c	Tue Jul  6 15:38:38 2010	(r209726)
@@ -331,13 +331,12 @@ void
 openpic_ipi(device_t dev, u_int cpu)
 {
 	struct openpic_softc *sc;
-	u_int cpuid;
+
+	KASSERT(dev == root_pic, ("Cannot send IPIs from non-root OpenPIC"));
 
 	sc = device_get_softc(dev);
 	sched_pin();
-	cpuid = (dev == root_pic) ? PCPU_GET(cpuid) : 0;
-
-	openpic_write(sc, OPENPIC_PCPU_IPI_DISPATCH(cpuid, 0),
+	openpic_write(sc, OPENPIC_PCPU_IPI_DISPATCH(PCPU_GET(cpuid), 0),
 	    1u << cpu);
 	sched_unpin();
 }