From a88677981517b5b7142daceabba4614629059949 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Mon, 28 Apr 2008 02:13:36 -0700
Subject: [PATCH] --- yaml --- r: 94055 b: refs/heads/master c:
 8cece85ec744bdc7ea0fc2d33f65b3f031c28468 h: refs/heads/master i:   94053:
 b9299396d5aa1c95fadbe53b0d40d52d08d434da   94051:
 24984ec8cc4c6590f21cc6f6d2db158c5b547b9e   94047:
 9f690a8a003d8b3045b00e8668ee167bc3e082ae v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/gfp.h | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index f98da5abffa3..ea5cef4a5fed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2309f9e6fe3f1de661eab9613f7903ab4420c753
+refs/heads/master: 8cece85ec744bdc7ea0fc2d33f65b3f031c28468
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 898aa9d5b6c2..c37653b6843f 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -119,29 +119,22 @@ static inline int allocflags_to_migratetype(gfp_t gfp_flags)
 
 static inline enum zone_type gfp_zone(gfp_t flags)
 {
-	int base = 0;
-
-#ifdef CONFIG_NUMA
-	if (flags & __GFP_THISNODE)
-		base = MAX_NR_ZONES;
-#endif
-
 #ifdef CONFIG_ZONE_DMA
 	if (flags & __GFP_DMA)
-		return base + ZONE_DMA;
+		return ZONE_DMA;
 #endif
 #ifdef CONFIG_ZONE_DMA32
 	if (flags & __GFP_DMA32)
-		return base + ZONE_DMA32;
+		return ZONE_DMA32;
 #endif
 	if ((flags & (__GFP_HIGHMEM | __GFP_MOVABLE)) ==
 			(__GFP_HIGHMEM | __GFP_MOVABLE))
-		return base + ZONE_MOVABLE;
+		return ZONE_MOVABLE;
 #ifdef CONFIG_HIGHMEM
 	if (flags & __GFP_HIGHMEM)
-		return base + ZONE_HIGHMEM;
+		return ZONE_HIGHMEM;
 #endif
-	return base + ZONE_NORMAL;
+	return ZONE_NORMAL;
 }
 
 /*