---

yaml --- r: 308887 b: refs/heads/master c: dbda591 h: refs/heads/master i: 308885: d117c45 308883: f9cfd99 308879: 805c72a v: v3
git-mirror · May 29, 2012 · 9730c5e · 9730c5e
1 parent 6ebdc11
commit 9730c5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26c191788f18129af0eb32a358cdaea0c7479626
+refs/heads/master: dbda591d920b4c7692725b13e3f68ecb251e9080
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
@@ -1185,9 +1185,10 @@ void __init vmalloc_init(void)
 	/* Import existing vmlist entries. */
 	for (tmp = vmlist; tmp; tmp = tmp->next) {
 		va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT);
-		va->flags = tmp->flags | VM_VM_AREA;
+		va->flags = VM_VM_AREA;
 		va->va_start = (unsigned long)tmp->addr;
 		va->va_end = va->va_start + tmp->size;
+		va->vm = tmp;
 		__insert_vmap_area(va);
 	}