1 files changed, 7 insertions, 11 deletions

diff --git a/mm/slub.c b/mm/slub.c
index d821ce6fff39..992ecd4f0d39 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -186,11 +186,6 @@ static inline void ClearSlabDebug(struct page *page)
 #define __OBJECT_POISON         0x80000000 /* Poison object */
 #define __SYSFS_ADD_DEFERRED    0x40000000 /* Not yet visible via sysfs */
 
-/* Not all arches define cache_line_size */
-#ifndef cache_line_size
-#define cache_line_size()       L1_CACHE_BYTES
-#endif
-
 static int kmem_size = sizeof(struct kmem_cache);
 
 #ifdef CONFIG_SMP
@@ -1330,7 +1325,9 @@ static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags)
 {
 #ifdef CONFIG_NUMA
         struct zonelist *zonelist;
-        struct zone **z;
+        struct zoneref *z;
+        struct zone *zone;
+        enum zone_type high_zoneidx = gfp_zone(flags);
         struct page *page;
 
         /*
@@ -1355,14 +1352,13 @@ static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags)
                         get_cycles() % 1024 > s->remote_node_defrag_ratio)
                 return NULL;
 
-        zonelist = &NODE_DATA(
-                slab_node(current->mempolicy))->node_zonelists[gfp_zone(flags)];
-        for (z = zonelist->zones; *z; z++) {
+        zonelist = node_zonelist(slab_node(current->mempolicy), flags);
+        for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
                 struct kmem_cache_node *n;
 
-                n = get_node(s, zone_to_nid(*z));
+                n = get_node(s, zone_to_nid(zone));
 
-                if (n && cpuset_zone_allowed_hardwall(*z, flags) &&
+                if (n && cpuset_zone_allowed_hardwall(zone, flags) &&
                                 n->nr_partial > MIN_PARTIAL) {
                         page = get_partial_node(n);
                         if (page)