From e7e531c9e195fb1818d2637e289a35886bd0e70b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 17 Oct 2006 00:09:57 -0700
Subject: [PATCH] --- yaml --- r: 39722 b: refs/heads/master c:
 286e1ea3ac1ca4f503ebbb3020bdb0cbe6adffac h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 59811e2e06de..4bfc8232e371 100644
--- 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
index 750ab6ed13fc..1133dd3aafcf 100644
--- 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);