[syscalls] Change vmar..._old() calls back and use new params ZX-2264 Test:CQ Change-Id: Idd336d0c171754c4c1258a8e6e7d24f0d3e0e585
diff --git a/executor/common_fuchsia.h b/executor/common_fuchsia.h index 6aad2da..4c0923b 100644 --- a/executor/common_fuchsia.h +++ b/executor/common_fuchsia.h
@@ -173,9 +173,9 @@ if (status != ZX_OK) return status; uintptr_t mapped_addr; - status = zx_vmar_map_old(root, - ZX_VM_FLAG_SPECIFIC_OVERWRITE | ZX_VM_FLAG_PERM_READ | - ZX_VM_FLAG_PERM_WRITE | ZX_VM_FLAG_PERM_EXECUTE, + status = zx_vmar_map(root, + ZX_VM_SPECIFIC_OVERWRITE | ZX_VM_PERM_READ | + ZX_VM_PERM_WRITE | ZX_VM_PERM_EXECUTE, addr - info.base, vmo, 0, size, &mapped_addr); return status; }
diff --git a/sys/fuchsia/vmars.txt b/sys/fuchsia/vmars.txt index 48b4ecc..f14a3e7 100644 --- a/sys/fuchsia/vmars.txt +++ b/sys/fuchsia/vmars.txt
@@ -5,12 +5,12 @@ resource zx_vmar[zx_handle] -zx_vmar_allocate_old(parent_handle zx_vmar, offset intptr, size intptr, map_flags flags[vmar_allocate_flags], out ptr[out, zx_vmar], child_addr ptr[out, intptr]) -zx_vmar_map_old(handle zx_vmar, vmar_offset intptr, vmo zx_vmo, vmo_offset int64, len intptr, map_flags flags[vmar_map_flags], mapped_addr ptr[out, intptr]) +zx_vmar_allocate(parent_handle zx_vmar, allocate_flags flags[vmar_allocate_flags], offset intptr, size intptr, out ptr[out, zx_vmar], child_addr ptr[out, intptr]) +zx_vmar_map(handle zx_vmar, map_flags flags[vmar_map_flags], vmar_offset intptr, vmo zx_vmo, vmo_offset int64, len intptr, mapped_addr ptr[out, intptr]) zx_vmar_unmap(handle zx_vmar, addr vma, len len[addr]) -zx_vmar_protect_old(handle zx_vmar, addr vma, len len[addr], prot_flags flags[vmar_protect_flags]) +zx_vmar_protect(handle zx_vmar, prot_flags flags[vmar_protect_flags], addr vma, len len[addr]) zx_vmar_destroy(handle zx_vmar) -vmar_allocate_flags = ZX_VM_FLAG_COMPACT, ZX_VM_FLAG_SPECIFIC, ZX_VM_FLAG_CAN_MAP_SPECIFIC, ZX_VM_FLAG_CAN_MAP_READ, ZX_VM_FLAG_CAN_MAP_WRITE, ZX_VM_FLAG_CAN_MAP_EXECUTE -vmar_map_flags = ZX_VM_FLAG_SPECIFIC, ZX_VM_FLAG_SPECIFIC_OVERWRITE, ZX_VM_FLAG_PERM_READ, ZX_VM_FLAG_PERM_WRITE, ZX_VM_FLAG_PERM_EXECUTE, ZX_VM_FLAG_MAP_RANGE -vmar_protect_flags = ZX_VM_FLAG_PERM_READ, ZX_VM_FLAG_PERM_WRITE, ZX_VM_FLAG_PERM_EXECUTE +vmar_allocate_flags = ZX_VM_COMPACT, ZX_VM_SPECIFIC, ZX_VM_CAN_MAP_SPECIFIC, ZX_VM_CAN_MAP_READ, ZX_VM_CAN_MAP_WRITE, ZX_VM_CAN_MAP_EXECUTE +vmar_map_flags = ZX_VM_SPECIFIC, ZX_VM_SPECIFIC_OVERWRITE, ZX_VM_PERM_READ, ZX_VM_PERM_WRITE, ZX_VM_PERM_EXECUTE, ZX_VM_MAP_RANGE +vmar_protect_flags = ZX_VM_PERM_READ, ZX_VM_PERM_WRITE, ZX_VM_PERM_EXECUTE