From 6cfebfd6f02fa2d658e36e2157e335da7fe46e9e Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 19 Jul 2007 01:49:10 -0700
Subject: [PATCH] --- yaml --- r: 61648 b: refs/heads/master c:
 7ac674f52778b95450509357435320be1d795248 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0c001fdd9c29..24055471938e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea02e3dde3509ffa7fda7f8de9c8a366e03f7bbd
+refs/heads/master: 7ac674f52778b95450509357435320be1d795248
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 3130c343088f..213d5e5079ff 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -583,9 +583,9 @@ void *vmalloc_exec(unsigned long size)
 }
 
 #if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32)
-#define GFP_VMALLOC32 GFP_DMA32
+#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL
 #elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA)
-#define GFP_VMALLOC32 GFP_DMA
+#define GFP_VMALLOC32 GFP_DMA | GFP_KERNEL
 #else
 #define GFP_VMALLOC32 GFP_KERNEL
 #endif