diff options
| author | kib <kib@FreeBSD.org> | 2017-03-14 10:06:20 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-03-14 10:06:20 +0000 |
| commit | c3bc35f1af2ceb980ff9ff4ef6f63d00ad235a66 (patch) | |
| tree | b87937c25da436c24365adf8a7c2d564e9bbf203 | |
| parent | 98ad5e5808607d0bb6730b6cf4fe9de01c8ee8a3 (diff) | |
| download | FreeBSD-src-c3bc35f1af2ceb980ff9ff4ef6f63d00ad235a66.zip FreeBSD-src-c3bc35f1af2ceb980ff9ff4ef6f63d00ad235a66.tar.gz | |
MFC r314849:
Consistently use vm_ooffset_t type for the vm object offset in
elf_load_section.
| -rw-r--r-- | sys/kern/imgact_elf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 32e7f8a..7a6691c 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -89,7 +89,7 @@ static Elf_Brandinfo *__elfN(get_brandinfo)(struct image_params *imgp, const char *interp, int interp_name_len, int32_t *osrel); static int __elfN(load_file)(struct proc *p, const char *file, u_long *addr, u_long *entry, size_t pagesize); -static int __elfN(load_section)(struct image_params *imgp, vm_offset_t offset, +static int __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot, size_t pagesize); static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp); @@ -490,7 +490,7 @@ __elfN(map_insert)(struct image_params *imgp, vm_map_t map, vm_object_t object, } static int -__elfN(load_section)(struct image_params *imgp, vm_offset_t offset, +__elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot, size_t pagesize) { @@ -501,7 +501,7 @@ __elfN(load_section)(struct image_params *imgp, vm_offset_t offset, vm_offset_t map_addr; int error, rv, cow; size_t copy_len; - vm_offset_t file_addr; + vm_ooffset_t file_addr; /* * It's necessary to fail if the filsz + offset taken from the |
