From owner-svn-src-stable-6@FreeBSD.ORG  Wed Jan 13 20:35:43 2010
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E028106584B;
	Wed, 13 Jan 2010 20:35:43 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B7658FC18;
	Wed, 13 Jan 2010 20:35:43 +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 o0DKZhxx016766;
	Wed, 13 Jan 2010 20:35:43 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0DKZhfb016764;
	Wed, 13 Jan 2010 20:35:43 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201001132035.o0DKZhfb016764@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 13 Jan 2010 20:35:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202236 - stable/6/sys/sparc64/isa
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2010 20:35:43 -0000

Author: marius
Date: Wed Jan 13 20:35:43 2010
New Revision: 202236
URL: http://svn.freebsd.org/changeset/base/202236

Log:
  MFC: r200880
  
  - Correct an off-by-one error when calculating the end of a child
    range.
  - Spell the PCI TLA in uppercase.

Modified:
  stable/6/sys/sparc64/isa/ofw_isa.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/sparc64/isa/ofw_isa.c
==============================================================================
--- stable/6/sys/sparc64/isa/ofw_isa.c	Wed Jan 13 20:35:37 2010	(r202235)
+++ stable/6/sys/sparc64/isa/ofw_isa.c	Wed Jan 13 20:35:43 2010	(r202236)
@@ -79,11 +79,11 @@ ofw_isa_range_map(struct isa_ranges *ran
 	for (i = 0; i < nrange; i++) {
 		r = &range[i];
 		cstart = ISA_RANGE_CHILD(r);
-		cend = cstart + r->size;
+		cend = cstart + r->size - 1;
 		if (*start < cstart || *start > cend)
 			continue;
 		if (*end < cstart || *end > cend) {
-			panic("ofw_isa_map_iorange: iorange crosses pci "
+			panic("ofw_isa_map_iorange: iorange crosses PCI "
 			    "ranges (%#lx not in %#lx - %#lx)", *end, cstart,
 			    cend);
 		}