From owner-svn-src-head@FreeBSD.ORG  Fri Jan 20 22:24:40 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 772EE1065670;
	Fri, 20 Jan 2012 22:24:40 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 659628FC12;
	Fri, 20 Jan 2012 22:24:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0KMOeRX061389;
	Fri, 20 Jan 2012 22:24:40 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0KMOeot061386;
	Fri, 20 Jan 2012 22:24:40 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201201202224.q0KMOeot061386@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 20 Jan 2012 22:24:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230398 - in head/sys/powerpc: ofw powermac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Jan 2012 22:24:40 -0000

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);
 	}