From 28592ee1ea1f5cdffcf85472f9de0285d928cf12 Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 3 Aug 2011 16:54:30 +0200
Subject: Imported Upstream version 59

---
 src/pkg/runtime/linux/mem.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/pkg/runtime/linux')

diff --git a/src/pkg/runtime/linux/mem.c b/src/pkg/runtime/linux/mem.c
index 38ca7e4a0..ad0fac6d3 100644
--- a/src/pkg/runtime/linux/mem.c
+++ b/src/pkg/runtime/linux/mem.c
@@ -91,6 +91,9 @@ runtime·SysMap(void *v, uintptr n)
 		if(p != v && addrspace_free(v, n)) {
 			// On some systems, mmap ignores v without
 			// MAP_FIXED, so retry if the address space is free.
+			if(p > (void*)4096) {
+				runtime·munmap(p, n);
+			}
 			p = runtime·mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_ANON|MAP_FIXED|MAP_PRIVATE, -1, 0);
 		}
 		if(p == (void*)ENOMEM)
-- 
cgit v1.2.3