Merge tag 'kvmarm-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

[sfrench/cifs-2.6.git] / tools / testing / selftests / kvm / lib / elf.c

diff --git a/tools/testing/selftests/kvm/lib/elf.c b/tools/testing/selftests/kvm/lib/elf.c
index 9f54c098d9d08ac095fae7e56fc7ceef4d5660aa..820ac2d08c98fb0e0466dc7d02e70caf54be47b9 100644 (file)
--- a/tools/testing/selftests/kvm/lib/elf.c
+++ b/tools/testing/selftests/kvm/lib/elf.c
@@ -138,7 +138,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename)
                offset = hdr.e_phoff + (n1 * hdr.e_phentsize);
                offset_rv = lseek(fd, offset, SEEK_SET);
                TEST_ASSERT(offset_rv == offset,
-                       "Failed to seek to begining of program header %u,\n"
+                       "Failed to seek to beginning of program header %u,\n"
                        "  filename: %s\n"
                        "  rv: %jd errno: %i",
                        n1, filename, (intmax_t) offset_rv, errno);
@@ -161,7 +161,8 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename)
                seg_vend |= vm->page_size - 1;
                size_t seg_size = seg_vend - seg_vstart + 1;
 
-               vm_vaddr_t vaddr = vm_vaddr_alloc(vm, seg_size, seg_vstart);
+               vm_vaddr_t vaddr = __vm_vaddr_alloc(vm, seg_size, seg_vstart,
+                                                   MEM_REGION_CODE);
                TEST_ASSERT(vaddr == seg_vstart, "Unable to allocate "
                        "virtual memory for segment at requested min addr,\n"
                        "  segment idx: %u\n"