From 23b53d2e247275adc345177b89ddfcef1c40e316 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jun 2011 06:11:24 +0900
Subject: [PATCH] --- yaml --- r: 252973 b: refs/heads/master c:
 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c h: refs/heads/master i:   252971:
 c569f63e3bff6b023b097f8642b4ab50f01025a9 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9f2b32cab095..0fbc83198eb3 100644
--- 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
index a4e1db3f1981..4e8985acdab8 100644
--- 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