From owner-p4-projects@FreeBSD.ORG  Tue Jun 21 14:08:30 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 778381065675; Tue, 21 Jun 2011 14:08:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DEF3106564A
	for <perforce@freebsd.org>; Tue, 21 Jun 2011 14:08:30 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BDF38FC15
	for <perforce@freebsd.org>; Tue, 21 Jun 2011 14:08:30 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5LE8TG4011908
	for <perforce@freebsd.org>; Tue, 21 Jun 2011 14:08:29 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5LE8TYD011905
	for perforce@freebsd.org; Tue, 21 Jun 2011 14:08:29 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 21 Jun 2011 14:08:29 GMT
Message-Id: <201106211408.p5LE8TYD011905@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 195096 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 21 Jun 2011 14:08:30 -0000

http://p4web.freebsd.org/@@195096?ac=10

Change 195096 by jhb@jhb_jhbbsd on 2011/06/21 14:07:54

	Be lenient if the length is wrong, but warn about it.

Affected files ...

.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#21 edit

Differences ...

==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#21 (text+ko) ====

@@ -211,7 +211,10 @@
 		    res->Data.Address.MinAddressFixed != ACPI_ADDRESS_FIXED ||
 		    res->Data.Address.MaxAddressFixed != ACPI_ADDRESS_FIXED)
 			break;
-		KASSERT(min + length - 1 == max, ("invalid range"));
+		if (min + length - 1 == max)
+			device_printf(sc->ap_dev,
+			    "Length mismatch for %d range: %jx vs %jx\n",
+			    (uintmax_t)max - min + 1, (uintmax_t)length);
 		flags = 0;
 		switch (res->Data.Address.ResourceType) {
 		case ACPI_MEMORY_RANGE: