diff options
| author | Paul Brook <paul@codesourcery.com> | 2010-03-12 23:23:29 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2010-03-12 23:25:52 +0000 |
| commit | b480d9b74dfd1efd29026b7dc6438364a633ee99 (patch) | |
| tree | ba5e9af2816fb452437070da74e87d15f55d7255 /linux-user | |
| parent | 4836a2b09a94969d3d69c5c9f9ba8f58767575ca (diff) | |
| download | qemu-b480d9b74dfd1efd29026b7dc6438364a633ee99.tar.gz | |
Fix usermode virtual address type
Usermode virtual addresses are abi_ulong, not target_ulong.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/elfload.c | 4 | ||||
| -rw-r--r-- | linux-user/mmap.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 71ed2d60d1..91eea62178 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2020,7 +2020,7 @@ static int vma_get_mapping_count(const struct mm_struct *); static struct vm_area_struct *vma_first(const struct mm_struct *); static struct vm_area_struct *vma_next(struct vm_area_struct *); static abi_ulong vma_dump_size(const struct vm_area_struct *); -static int vma_walker(void *priv, unsigned long start, unsigned long end, +static int vma_walker(void *priv, abi_ulong start, abi_ulong end, unsigned long flags); static void fill_elf_header(struct elfhdr *, int, uint16_t, uint32_t); @@ -2173,7 +2173,7 @@ static abi_ulong vma_dump_size(const struct vm_area_struct *vma) return (vma->vma_end - vma->vma_start); } -static int vma_walker(void *priv, unsigned long start, unsigned long end, +static int vma_walker(void *priv, abi_ulong start, abi_ulong end, unsigned long flags) { struct mm_struct *mm = (struct mm_struct *)priv; diff --git a/linux-user/mmap.c b/linux-user/mmap.c index ad00b6f555..46923c707c 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -88,7 +88,7 @@ void *qemu_vmalloc(size_t size) if (h2g_valid(p)) { /* Allocated region overlaps guest address space. This may recurse. */ - unsigned long addr = h2g(p); + abi_ulong addr = h2g(p); page_set_flags(addr & TARGET_PAGE_MASK, TARGET_PAGE_ALIGN(addr + size), PAGE_RESERVED); } |