From dd24b8d9160d0181993b23609903f5fe228fbb56 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Mon, 21 Sep 2009 17:02:32 -0700
Subject: [PATCH] --- yaml --- r: 164428 b: refs/heads/master c:
 dd32c279983bf77fdcc8a9aa4a05b0ffdc75859c h: refs/heads/master v: v3

---
 [refs]             |  2 +-
 trunk/mm/vmalloc.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index dd15e747b7c2..d5b76f9a512a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f66a68f3fac2e94da360c342ff78ab45553f86c
+refs/heads/master: dd32c279983bf77fdcc8a9aa4a05b0ffdc75859c
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 759deae4539a..c4071fa8e12a 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -1270,17 +1270,21 @@ struct vm_struct *remove_vm_area(const void *addr)
 	if (va && va->flags & VM_VM_AREA) {
 		struct vm_struct *vm = va->private;
 		struct vm_struct *tmp, **p;
-
-		vmap_debug_free_range(va->va_start, va->va_end);
-		free_unmap_vmap_area(va);
-		vm->size -= PAGE_SIZE;
-
+		/*
+		 * remove from list and disallow access to this vm_struct
+		 * before unmap. (address range confliction is maintained by
+		 * vmap.)
+		 */
 		write_lock(&vmlist_lock);
 		for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next)
 			;
 		*p = tmp->next;
 		write_unlock(&vmlist_lock);
 
+		vmap_debug_free_range(va->va_start, va->va_end);
+		free_unmap_vmap_area(va);
+		vm->size -= PAGE_SIZE;
+
 		return vm;
 	}
 	return NULL;