Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 20 Jan 2012 22:24:40 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r230398 - in head/sys/powerpc: ofw powermac
Message-ID:  <201201202224.q0KMOeot061386@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: nwhitehorn
Date: Fri Jan 20 22:24:39 2012
New Revision: 230398
URL: http://svn.freebsd.org/changeset/base/230398

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

Modified:
  head/sys/powerpc/ofw/ofw_machdep.c
  head/sys/powerpc/powermac/macio.c

Modified: head/sys/powerpc/ofw/ofw_machdep.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_machdep.c	Fri Jan 20 22:04:59 2012	(r230397)
+++ head/sys/powerpc/ofw/ofw_machdep.c	Fri Jan 20 22:24:39 2012	(r230398)
@@ -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: head/sys/powerpc/powermac/macio.c
==============================================================================
--- head/sys/powerpc/powermac/macio.c	Fri Jan 20 22:04:59 2012	(r230397)
+++ head/sys/powerpc/powermac/macio.c	Fri Jan 20 22:24:39 2012	(r230398)
@@ -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);
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201202224.q0KMOeot061386>