2 files changed, 1 insertions, 17 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index a9963ceddd65..9870624d72a6 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1096,7 +1096,7 @@ static struct zonelist *zonelist_policy(gfp_t gfp, struct mempolicy *policy)
         case MPOL_BIND:
                 /* Lower zones don't get a policy applied */
                 /* Careful: current->mems_allowed might have moved */
-                if (gfp_zone(gfp) >= policy_zone)
+                if (highest_zone(gfp) >= policy_zone)
                         if (cpuset_zonelist_valid_mems_allowed(policy->v.zonelist))
                                 return policy->v.zonelist;
                 /*FALL THROUGH*/
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6c7c2dd1b3ed..25f39865e324 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1376,22 +1376,6 @@ static int __meminit build_zonelists_node(pg_data_t *pgdat,
         return nr_zones;
 }
 
-static inline int highest_zone(int zone_bits)
-{
-        int res = ZONE_NORMAL;
-#ifdef CONFIG_HIGHMEM
-        if (zone_bits & (__force int)__GFP_HIGHMEM)
-                res = ZONE_HIGHMEM;
-#endif
-#ifdef CONFIG_ZONE_DMA32
-        if (zone_bits & (__force int)__GFP_DMA32)
-                res = ZONE_DMA32;
-#endif
-        if (zone_bits & (__force int)__GFP_DMA)
-                res = ZONE_DMA;
-        return res;
-}
-
 #ifdef CONFIG_NUMA
 #define MAX_NODE_LOAD (num_online_nodes())
 static int __meminitdata node_load[MAX_NUMNODES];