From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 11 Dec 2008 19:12:25 +0000 (+0000)
Subject: Fix compiling without MREMAP_FIXED
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5caf7bb2c481f43a9d019732610751bc22913eba;p=qemu.git

Fix compiling without MREMAP_FIXED

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5979 c046a42c-6fe2-441c-8c8c-71466251a162
---

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) {