---

yaml --- r: 61648 b: refs/heads/master c: 7ac674f h: refs/heads/master v: v3
git-mirror · Jul 19, 2007 · 6cfebfd · 6cfebfd
1 parent bf86437
commit 6cfebfd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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