svn commit: r231021 - in stable/9/sys/powerpc: ofw powermac

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Feb  5 16:14:23 2012
New Revision: 231021
URL: http://svn.freebsd.org/changeset/base/231021

Log:
  MFC r230398:
  
  Prevent an error resulting from signed/unsigned comparison on systems
  that do not comply with the OF spec.
  
  Submitted by:	Anders Gavare

Modified:
  stable/9/sys/powerpc/ofw/ofw_machdep.c
  stable/9/sys/powerpc/powermac/macio.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/modules/sound/driver/emu10k1/   (props changed)
  stable/9/sys/modules/sound/driver/emu10kx/   (props changed)
  stable/9/sys/modules/sound/driver/maestro3/   (props changed)

Modified: stable/9/sys/powerpc/ofw/ofw_machdep.c
==============================================================================
--- stable/9/sys/powerpc/ofw/ofw_machdep.c	Sun Feb  5 16:08:45 2012	(r231020)
+++ stable/9/sys/powerpc/ofw/ofw_machdep.c	Sun Feb  5 16:14:23 2012	(r231021)
@@ -171,10 +171,10 @@ parse_ofw_memory(phandle_t node, const c
 	 */
 	phandle = OF_finddevice("/");
 	if (OF_getprop(phandle, "#address-cells", &address_cells, 
-	    sizeof(address_cells)) < sizeof(address_cells))
+	    sizeof(address_cells)) < (ssize_t)sizeof(address_cells))
 		address_cells = 1;
 	if (OF_getprop(phandle, "#size-cells", &size_cells, 
-	    sizeof(size_cells)) < sizeof(size_cells))
+	    sizeof(size_cells)) < (ssize_t)sizeof(size_cells))
 		size_cells = 1;
 
 	/*

Modified: stable/9/sys/powerpc/powermac/macio.c
==============================================================================
--- stable/9/sys/powerpc/powermac/macio.c	Sun Feb  5 16:08:45 2012	(r231020)
+++ stable/9/sys/powerpc/powermac/macio.c	Sun Feb  5 16:14:23 2012	(r231021)
@@ -293,7 +293,7 @@ macio_attach(device_t dev)
 	 * Locate the device node and it's base address
 	 */
 	if (OF_getprop(root, "assigned-addresses", 
-		       reg, sizeof(reg)) < sizeof(reg)) {
+		       reg, sizeof(reg)) < (ssize_t)sizeof(reg)) {
 		return (ENXIO);
 	}