From owner-svn-src-projects@FreeBSD.ORG Wed Mar 16 04:03:13 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2490106564A; Wed, 16 Mar 2011 04:03:13 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 878F08FC0A; Wed, 16 Mar 2011 04:03:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2G43DQM068944; Wed, 16 Mar 2011 04:03:13 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2G43Dnt068941; Wed, 16 Mar 2011 04:03:13 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201103160403.p2G43Dnt068941@svn.freebsd.org> From: Marcel Moolenaar Date: Wed, 16 Mar 2011 04:03:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219692 - in projects/altix/sys: arm/mv boot/efi/libefi kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Mar 2011 04:03:13 -0000 Author: marcel Date: Wed Mar 16 04:03:13 2011 New Revision: 219692 URL: http://svn.freebsd.org/changeset/base/219692 Log: Merge svn+ssh://svn.freebsd.org/base/head@219691 Modified: projects/altix/sys/arm/mv/gpio.c projects/altix/sys/boot/efi/libefi/efipart.c Directory Properties: projects/altix/lib/libstand/ (props changed) projects/altix/sys/ (props changed) projects/altix/sys/amd64/include/xen/ (props changed) projects/altix/sys/boot/i386/efi/ (props changed) projects/altix/sys/boot/ia64/efi/ (props changed) projects/altix/sys/boot/ia64/ski/ (props changed) projects/altix/sys/boot/powerpc/boot1.chrp/ (props changed) projects/altix/sys/boot/powerpc/ofw/ (props changed) projects/altix/sys/cddl/contrib/opensolaris/ (props changed) projects/altix/sys/conf/ (props changed) projects/altix/sys/contrib/dev/acpica/ (props changed) projects/altix/sys/contrib/octeon-sdk/ (props changed) projects/altix/sys/contrib/pf/ (props changed) projects/altix/sys/contrib/x86emu/ (props changed) projects/altix/sys/kern/subr_busdma.c (props changed) Modified: projects/altix/sys/arm/mv/gpio.c ============================================================================== --- projects/altix/sys/arm/mv/gpio.c Wed Mar 16 03:53:18 2011 (r219691) +++ projects/altix/sys/arm/mv/gpio.c Wed Mar 16 04:03:13 2011 (r219692) @@ -344,7 +344,7 @@ uint8_t mv_gpio_in(uint32_t pin) { - return (mv_gpio_value_get(pin)); + return (mv_gpio_value_get(pin) ? 1 : 0); } static uint32_t Modified: projects/altix/sys/boot/efi/libefi/efipart.c ============================================================================== --- projects/altix/sys/boot/efi/libefi/efipart.c Wed Mar 16 03:53:18 2011 (r219691) +++ projects/altix/sys/boot/efi/libefi/efipart.c Wed Mar 16 04:03:13 2011 (r219692) @@ -204,7 +204,7 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, i } if (EFI_ERROR(status)) - printf("%s: rw=%d, status=%u\n", __func__, rw, status); + printf("%s: rw=%d, status=%lu\n", __func__, rw, (u_long)status); return (efi_status_to_errno(status)); }