diff options
| author | smh <smh@FreeBSD.org> | 2016-01-28 12:11:42 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2016-01-28 12:11:42 +0000 |
| commit | 634e73dbb861268bd122cc29b02b1a56df450dd6 (patch) | |
| tree | 7fd1c618154ccfb649dc2a3ef4b6030c01df8f81 /sys/boot/common/load_elf.c | |
| parent | fe8f0aa165649acdaf27427ebefed487585a9d35 (diff) | |
| download | FreeBSD-src-634e73dbb861268bd122cc29b02b1a56df450dd6.zip FreeBSD-src-634e73dbb861268bd122cc29b02b1a56df450dd6.tar.gz | |
MFC r281169, r293724, r293796, r294029, r294041, r294058
MFC r281169 (by andrew):
Make global variabled only used in this file static
MFC r294058:
Make common boot file_loadraw name parameter const
MFC r294041:
Remove unused reg param from fdt_fixup_memory
MFC r293724:
Enable warnings in EFI boot code
MFC r293796:
Fix typo in libefi.c
MFC r294029:
Only build EFI components on supported compilers
Sponsored by: Multiplay
Diffstat (limited to 'sys/boot/common/load_elf.c')
| -rw-r--r-- | sys/boot/common/load_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c index 200a29c..6a88e39 100644 --- a/sys/boot/common/load_elf.c +++ b/sys/boot/common/load_elf.c @@ -856,7 +856,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 += ef->off; + md.md_data = (void *)((uintptr_t)md.md_data + ef->off); } else if (error != 0) return (error); #endif |
