---

yaml --- r: 252973 b: refs/heads/master c: 1fa7b6a h: refs/heads/master i: 252971: c569f63 v: v3
git-mirror · Jun 1, 2011 · 23b53d2 · 23b53d2
1 parent bc99779
commit 23b53d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0f52a9463839c52a63c05d6e7d4a330d94a9794
+refs/heads/master: 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -2247,10 +2247,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
 
 	if (should_fail_alloc_page(gfp_mask, order))
 		return NULL;
-#ifndef CONFIG_ZONE_DMA
-	if (WARN_ON_ONCE(gfp_mask & __GFP_DMA))
-		return NULL;
-#endif
 
 	/*
 	 * Check the zones suitable for the gfp_mask contain at least one