PERFORCE change 195050 for review

[John Baldwin]

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

Change 195050 by jhb at 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;