From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LAqxY-0000p0-DB
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:12:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LAqxX-0000oP-NO
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:12:27 -0500
Received: from [199.232.76.173] (port=57749 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LAqxX-0000oA-Iv
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:12:27 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59048 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LAqxX-0005eQ-CL
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:12:27 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LAqxW-000196-OV
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 19:12:26 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LAqxW-000192-AB
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 19:12:26 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LAqxW-000192-AB@cvs.savannah.gnu.org>
Date: Thu, 11 Dec 2008 19:12:26 +0000
Subject: [Qemu-devel] [5979] Fix compiling without MREMAP_FIXED
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5979
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5979
Author:   blueswir1
Date:     2008-12-11 19:12:25 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
Fix compiling without MREMAP_FIXED

Modified Paths:
--------------
    trunk/linux-user/mmap.c

Modified: trunk/linux-user/mmap.c
===================================================================
--- trunk/linux-user/mmap.c	2008-12-11 17:30:50 UTC (rev 5978)
+++ trunk/linux-user/mmap.c	2008-12-11 19:12:25 UTC (rev 5979)
@@ -546,6 +546,7 @@
 
     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 @@
         } 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) {