Date: Wed, 16 Mar 2011 04:03:13 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r219692 - in projects/altix/sys: arm/mv boot/efi/libefi kern Message-ID: <201103160403.p2G43Dnt068941@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103160403.p2G43Dnt068941>