svn commit: r315239 - stable/11/sys/kern

[Konstantin Belousov]

Author: kib
Date: Tue Mar 14 10:06:20 2017
New Revision: 315239
URL: https://svnweb.freebsd.org/changeset/base/315239

Log:
  MFC r314849:
  Consistently use vm_ooffset_t type for the vm object offset in
  elf_load_section.

Modified:
  stable/11/sys/kern/imgact_elf.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/imgact_elf.c
==============================================================================
--- stable/11/sys/kern/imgact_elf.c	Tue Mar 14 09:25:01 2017	(r315238)
+++ stable/11/sys/kern/imgact_elf.c	Tue Mar 14 10:06:20 2017	(r315239)
@@ -89,7 +89,7 @@ static Elf_Brandinfo *__elfN(get_brandin
     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 *
 }
 
 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
 	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