From owner-svn-src-all@FreeBSD.ORG Sun Feb 5 16:14:23 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB882106564A; Sun, 5 Feb 2012 16:14:23 +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 9EE1B8FC12; Sun, 5 Feb 2012 16:14:23 +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 q15GENrq090541; Sun, 5 Feb 2012 16:14:23 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q15GENlt090538; Sun, 5 Feb 2012 16:14:23 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201202051614.q15GENlt090538@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 5 Feb 2012 16:14:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231021 - in stable/9/sys/powerpc: ofw powermac X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2012 16:14:23 -0000 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); }