---

yaml --- r: 39722 b: refs/heads/master c: 286e1ea h: refs/heads/master v: v3
git-mirror · Oct 17, 2006 · e7e531c · e7e531c
1 parent 437478c
commit e7e531c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c430169e0c9f42f2cd27e0a6161e7ff4dc7e608d
+refs/heads/master: 286e1ea3ac1ca4f503ebbb3020bdb0cbe6adffac
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
@@ -428,8 +428,11 @@ void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
 	if (array_size > PAGE_SIZE) {
 		pages = __vmalloc_node(array_size, gfp_mask, PAGE_KERNEL, node);
 		area->flags |= VM_VPAGES;
-	} else
-		pages = kmalloc_node(array_size, (gfp_mask & ~__GFP_HIGHMEM), node);
+	} else {
+		pages = kmalloc_node(array_size,
+				(gfp_mask & ~(__GFP_HIGHMEM | __GFP_ZERO)),
+				node);
+	}
 	area->pages = pages;
 	if (!area->pages) {
 		remove_vm_area(area->addr);