From 3af72a4d98dca033492102603734cbc63cd2694a Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Mon, 15 Dec 2008 17:58:49 +0000 Subject: [PATCH] Fix mremap, based on patch by Kirill A. Shutemov git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6056 c046a42c-6fe2-441c-8c8c-71466251a162 --- linux-user/mmap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 00a941e..ead1112 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "qemu.h" #include "qemu-common.h" @@ -546,10 +548,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, mmap_lock(); -#if defined(MREMAP_FIXED) if (flags & MREMAP_FIXED) - host_addr = mremap(g2h(old_addr), old_size, new_size, - flags, new_addr); + host_addr = (void *) syscall(__NR_mremap, g2h(old_addr), + old_size, new_size, + flags, + new_addr); else if (flags & MREMAP_MAYMOVE) { abi_ulong mmap_start; @@ -559,11 +562,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, errno = ENOMEM; host_addr = MAP_FAILED; } else - host_addr = mremap(g2h(old_addr), old_size, new_size, - flags | MREMAP_FIXED, g2h(mmap_start)); - } else -#endif - { + host_addr = (void *) syscall(__NR_mremap, g2h(old_addr), + old_size, new_size, + flags | MREMAP_FIXED, + g2h(mmap_start)); + } else { host_addr = mremap(g2h(old_addr), old_size, new_size, flags); /* Check if address fits target address space */ if ((unsigned long)host_addr + new_size > (abi_ulong)-1) { -- 1.7.9.5