diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-11 19:12:25 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-11 19:12:25 +0000 |
| commit | 8dfff9c8c4d05444a0242fb5ae666992c0ea9040 (patch) | |
| tree | 251d2b5609dc9e5ff81acdb6324fe270c9f60770 | |
| parent | b1fab0db6b579c7e17b154f7c60d5b93ea09efd3 (diff) | |
| download | qemu-8dfff9c8c4d05444a0242fb5ae666992c0ea9040.tar.gz qemu-8dfff9c8c4d05444a0242fb5ae666992c0ea9040.tar.bz2 qemu-8dfff9c8c4d05444a0242fb5ae666992c0ea9040.zip | |
Fix compiling without MREMAP_FIXED
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5979 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | linux-user/mmap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index aad00e6175..00a941e33a 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -546,6 +546,7 @@ 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); @@ -560,7 +561,9 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, } else host_addr = mremap(g2h(old_addr), old_size, new_size, flags | MREMAP_FIXED, g2h(mmap_start)); - } else { + } else +#endif + { 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) { |