From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LCHiW-0003IK-5h
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:58:52 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LCHiV-0003Hy-Mp
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:58:51 -0500
Received: from [199.232.76.173] (port=40040 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LCHiV-0003Hs-Ed
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:58:51 -0500
Received: from savannah.gnu.org ([199.232.41.3]:45046 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 1LCHiV-00061v-1F
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 12:58:51 -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 1LCHiT-0004CJ-TV
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 17:58:50 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LCHiT-0004CF-Lp
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 17:58:49 +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: <E1LCHiT-0004CF-Lp@cvs.savannah.gnu.org>
Date: Mon, 15 Dec 2008 17:58:49 +0000
Subject: [Qemu-devel] [6056] Fix mremap, based on patch by Kirill A.
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: 6056
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6056
Author:   blueswir1
Date:     2008-12-15 17:58:49 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Fix mremap, based on patch by Kirill A. Shutemov

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

Modified: trunk/linux-user/mmap.c
===================================================================
--- trunk/linux-user/mmap.c	2008-12-15 17:14:58 UTC (rev 6055)
+++ trunk/linux-user/mmap.c	2008-12-15 17:58:49 UTC (rev 6056)
@@ -24,6 +24,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <linux/mman.h>
+#include <linux/unistd.h>
 
 #include "qemu.h"
 #include "qemu-common.h"
@@ -546,10 +548,11 @@
 
     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 @@
             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) {