1 files changed, 21 insertions, 17 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 7c9ca82f6be9..f989af87b72c 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -984,46 +984,50 @@ static void drain_alien_cache(struct kmem_cache *cachep,
         }
 }
 
-static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
+static int __cache_free_alien(struct kmem_cache *cachep, void *objp,
+                                int node, int page_node)
 {
-        int nodeid = page_to_nid(virt_to_page(objp));
         struct kmem_cache_node *n;
         struct alien_cache *alien = NULL;
         struct array_cache *ac;
-        int node;
         LIST_HEAD(list);
 
-        node = numa_mem_id();
-
-        /*
-         * Make sure we are not freeing a object from another node to the array
-         * cache on this cpu.
-         */
-        if (likely(nodeid == node))
-                return 0;
-
         n = get_node(cachep, node);
         STATS_INC_NODEFREES(cachep);
-        if (n->alien && n->alien[nodeid]) {
-                alien = n->alien[nodeid];
+        if (n->alien && n->alien[page_node]) {
+                alien = n->alien[page_node];
                 ac = &alien->ac;
                 spin_lock(&alien->lock);
                 if (unlikely(ac->avail == ac->limit)) {
                         STATS_INC_ACOVERFLOW(cachep);
-                        __drain_alien_cache(cachep, ac, nodeid, &list);
+                        __drain_alien_cache(cachep, ac, page_node, &list);
                 }
                 ac_put_obj(cachep, ac, objp);
                 spin_unlock(&alien->lock);
                 slabs_destroy(cachep, &list);
         } else {
-                n = get_node(cachep, nodeid);
+                n = get_node(cachep, page_node);
                 spin_lock(&n->list_lock);
-                free_block(cachep, &objp, 1, nodeid, &list);
+                free_block(cachep, &objp, 1, page_node, &list);
                 spin_unlock(&n->list_lock);
                 slabs_destroy(cachep, &list);
         }
         return 1;
 }
+
+static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
+{
+        int page_node = page_to_nid(virt_to_page(objp));
+        int node = numa_mem_id();
+        /*
+         * Make sure we are not freeing a object from another node to the array
+         * cache on this cpu.
+         */
+        if (likely(node == page_node))
+                return 0;
+
+        return __cache_free_alien(cachep, objp, node, page_node);
+}
 #endif
 
 /*