diff options
author | smh <smh@FreeBSD.org> | 2016-02-06 22:01:25 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2016-02-06 22:01:25 +0000 |
commit | 993c2695aa5e66d4379e155446baeeb4d6c9c8c0 (patch) | |
tree | d8dc32d4a916a44023ac761bdb905f8d88f5f8f0 | |
parent | 5b12d896ba622682f675117c93a7da3a68c78190 (diff) | |
download | FreeBSD-src-993c2695aa5e66d4379e155446baeeb4d6c9c8c0.zip FreeBSD-src-993c2695aa5e66d4379e155446baeeb4d6c9c8c0.tar.gz |
Fix EFI platform build failures
With warnings now enabled some plaforms where failing due to warnings.
* Fix st_size printed as a size_t when its actually an off_t.
* Fix pointer conversion in load_elf for some 32bit platforms due to 64bit
off in ef.
MFC after: 2 days
X-MFC-With:
Sponsored by: Multiplay
-rw-r--r-- | sys/boot/common/load_elf.c | 2 | ||||
-rw-r--r-- | sys/boot/efi/boot1/zfs_module.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c index 0ff1a15..3207f73 100644 --- a/sys/boot/common/load_elf.c +++ b/sys/boot/common/load_elf.c @@ -886,7 +886,7 @@ __elfN(parse_modmetadata)(struct preloaded_file *fp, elf_file_t ef, error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); if (error == EOPNOTSUPP) { md.md_cval += ef->off; - md.md_data = (void *)((uintptr_t)md.md_data + ef->off); + md.md_data = (void *)((uintptr_t)md.md_data + (uintptr_t)ef->off); } else if (error != 0) return (error); #endif diff --git a/sys/boot/efi/boot1/zfs_module.c b/sys/boot/efi/boot1/zfs_module.c index 4e2c5c4..925f0b2 100644 --- a/sys/boot/efi/boot1/zfs_module.c +++ b/sys/boot/efi/boot1/zfs_module.c @@ -135,7 +135,7 @@ load(const char *filepath, dev_info_t *devinfo, void **bufp, size_t *bufsize) if ((status = bs->AllocatePool(EfiLoaderData, (UINTN)st.st_size, &buf)) != EFI_SUCCESS) { - printf("Failed to allocate load buffer %zu for pool '%s' for '%s' " + printf("Failed to allocate load buffer %zd for pool '%s' for '%s' " "(%lu)\n", st.st_size, spa->spa_name, filepath, EFI_ERROR_CODE(status)); return (EFI_INVALID_PARAMETER); } |