X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmman%2Fmremap.c;h=cc6991a635e1d2e2eb82f8f24fc39534901d6502;hb=074932c84d34273821e3bfc2511e60a5ce78b8d8;hp=1096ace100d0d3ddd285a399f82028a864f3bc0c;hpb=f9ecb6bfa1dc9f93a10dad97a158e6b8334c586c;p=musl

diff --git a/src/mman/mremap.c b/src/mman/mremap.c
index 1096ace1..cc6991a6 100644
--- a/src/mman/mremap.c
+++ b/src/mman/mremap.c
@@ -1,24 +1,30 @@
+#define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
+
+static void dummy(void) { }
+weak_alias(dummy, __vm_wait);
 
 void *__mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...)
 {
 	va_list ap;
-	void *new_addr;
+	void *new_addr = 0;
 
 	if (new_len >= PTRDIFF_MAX) {
 		errno = ENOMEM;
 		return MAP_FAILED;
 	}
 
-	va_start(ap, flags);
-	new_addr = va_arg(ap, void *);
-	va_end(ap);
+	if (flags & MREMAP_FIXED) {
+		__vm_wait();
+		va_start(ap, flags);
+		new_addr = va_arg(ap, void *);
+		va_end(ap);
+	}
 
 	return (void *)syscall(SYS_mremap, old_addr, old_len, new_len, flags, new_addr);
 }