From owner-p4-projects@FreeBSD.ORG  Mon Jun 20 19:17:20 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C0D01065675; Mon, 20 Jun 2011 19:17:20 +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 3E9DA1065672
	for <perforce@freebsd.org>; Mon, 20 Jun 2011 19:17:20 +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 132938FC21
	for <perforce@freebsd.org>; Mon, 20 Jun 2011 19:17:20 +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 p5KJHJU4081078
	for <perforce@freebsd.org>; Mon, 20 Jun 2011 19:17:19 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5KJHJMA081075
	for perforce@freebsd.org; Mon, 20 Jun 2011 19:17:19 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 20 Jun 2011 19:17:19 GMT
Message-Id: <201106201917.p5KJHJMA081075@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 195050 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: Mon, 20 Jun 2011 19:17:20 -0000

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

Change 195050 by jhb@jhb_pipkin on 2011/06/20 19:16:50

	Compile fixes on i386.

Affected files ...

.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#20 edit
.. //depot/projects/pci/sys/dev/acpica/acpi_resource.c#6 edit
.. //depot/projects/pci/sys/x86/x86/mptable.c#8 edit

Differences ...

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

@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/limits.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/rman.h>
@@ -254,7 +255,7 @@
 		}
 		if (max > ULONG_MAX) {
 			device_printf(sc->ap_dev,
-			    "Truncating end of range above 4GB (%#jx-%#jx)\n",
+       		    "Truncating end of %d range above 4GB (%#jx-%#jx)\n",
 			    type, (uintmax_t)min, (uintmax_t)max);
 			max = ULONG_MAX;
 		}
@@ -262,8 +263,8 @@
 		error = pcib_host_res_decodes(&sc->ap_host_res, type, min, max,
 		    flags);
 		if (error)
-			panic("Failed to manage %d range (%#jx-%#jx): %d", type,
-			    (uintmax_t)min, (uintmax_t)max, error);
+			panic("Failed to manage %d range (%#jx-%#jx): %d",
+			    type, (uintmax_t)min, (uintmax_t)max, error);
 		break;
 	default:
 		break;

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

@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
+#include <sys/limits.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 
@@ -330,8 +331,8 @@
 	}
 
 #ifdef __i386__
-	if (min > ULONG_MAX || res->Data.Address.MaxAddressFixed && max >
-	    ULONG_MAX) {
+	if (min > ULONG_MAX || (res->Data.Address.MaxAddressFixed && max >
+	    ULONG_MAX)) {
 	    ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "ignored %s above 4G\n",
 		name));
 	    break;

==== //depot/projects/pci/sys/x86/x86/mptable.c#8 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/limits.h>
 #include <sys/malloc.h>
 #ifdef NEW_PCIB
 #include <sys/rman.h>
@@ -1148,7 +1149,7 @@
 		}
 		if (end > ULONG_MAX) {
 			device_printf(args->dev,
-			    "Truncating end of range above 4GB (%#jx-%#jx)\n",
+		    "Truncating end of %d range above 4GB (%#jx-%#jx)\n",
 			    type, (uintmax_t)start, (uintmax_t)end);
 			end = ULONG_MAX;
 		}
@@ -1156,8 +1157,8 @@
 		error = pcib_host_res_decodes(&args->sc->sc_host_res, type,
 		    start, end, flags);
 		if (error)
-			panic("Failed to manage %d range (%#jx-%#jx): %d", type,
-			    (uintmax_t)start, (uintmax_t)end, error);
+			panic("Failed to manage %d range (%#jx-%#jx): %d",
+			    type, (uintmax_t)start, (uintmax_t)end, error);
 		break;
 	case MPCT_EXTENTRY_CBASM:
 		cbasm = (cbasm_entry_ptr)entry;