From owner-p4-projects@FreeBSD.ORG  Thu Apr 13 05:22:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD5EE16A404; Thu, 13 Apr 2006 05:22:00 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9C3EB16A402
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 05:22:00 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6AE4B43D45
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 05:22:00 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D5M0tn086310
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 05:22:00 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D5M0PF086300
	for perforce@freebsd.org; Thu, 13 Apr 2006 05:22:00 GMT
	(envelope-from jmg@freebsd.org)
Date: Thu, 13 Apr 2006 05:22:00 GMT
Message-Id: <200604130522.k3D5M0PF086300@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95143 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Apr 2006 05:22:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=95143

Change 95143 by jmg@jmg_arlene on 2006/04/13 05:21:39

	make sure pciintr is an array index..

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#39 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#39 (text+ko) ====

@@ -440,6 +440,7 @@
 	KASSERT(pciintr >= 1 && pciintr <= 4,
 	    ("interrupt out of range"));
 	rid = pciintr;
+	pciintr--;
 	if (sc->hs_intr[pciintr] == NULL) {
 		if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev,
 		    SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
@@ -477,6 +478,7 @@
 
 	sc = device_get_softc(dev);
 	pciintr = rman_get_start(vec);
+	pciintr--;
 
 	error = bus_teardown_intr(dev, sc->hs_intr[pciintr], cookie);
 	if (error)