From a2d3053354432f3e3b5a787c1527d4b414e9acb0 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Fri, 10 Apr 2015 03:47:42 -0400
Subject: apply vmlock wait to __unmapself in pthread_exit

---
 src/thread/pthread_create.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 08c5f4f8..33808ce5 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -108,6 +108,10 @@ _Noreturn void __pthread_exit(void *result)
 		if (self->robust_list.off)
 			__syscall(SYS_set_robust_list, 0, 3*sizeof(long));
 
+		/* Since __unmapself bypasses the normal munmap code path,
+		 * explicitly wait for vmlock holders first. */
+		__vm_wait();
+
 		/* The following call unmaps the thread's stack mapping
 		 * and then exits without touching the stack. */
 		__unmapself(self->map_base, self->map_size);
-- 
cgit v1.2.3-70-g09d2