aboutsummaryrefslogtreecommitdiff
path: root/linux-user/mmap.c
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-11 19:12:25 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-11 19:12:25 +0000
commit5caf7bb2c481f43a9d019732610751bc22913eba (patch)
tree251d2b5609dc9e5ff81acdb6324fe270c9f60770 /linux-user/mmap.c
parent85df0de4cfe54fd64df7e37448cd152d0c9199a4 (diff)
Fix compiling without MREMAP_FIXED
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5979 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user/mmap.c')
-rw-r--r--linux-user/mmap.c5
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) {