Revert "mm: micro-optimise slab to avoid a function call"

This reverts commit 381760eadc393bcb1bb328510ad75cf13431806d.
jamison904 · Oct 21, 2013 · d36f50b · d36f50b
1 parent 2dfac21
commit d36f50b
Showing 1 changed file with 2 additions and 26 deletions.
diff --git a/mm/slab.c b/mm/slab.c
@@ -117,8 +117,6 @@
 #include	<linux/memory.h>
 #include	<linux/prefetch.h>
 
-#include	<net/sock.h>
-
 #include	<asm/cacheflush.h>
 #include	<asm/tlbflush.h>
 #include	<asm/page.h>
@@ -963,7 +961,7 @@ static void recheck_pfmemalloc_active(struct kmem_cache *cachep,
 	spin_unlock_irqrestore(&l3->list_lock, flags);
 }
 
-static void *__ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
+static void *ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
 						gfp_t flags, bool force_refill)
 {
 	int i;
@@ -1010,20 +1008,7 @@ static void *__ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
 	return objp;
 }
 
-static inline void *ac_get_obj(struct kmem_cache *cachep,
-			struct array_cache *ac, gfp_t flags, bool force_refill)
-{
-	void *objp;
-
-	if (unlikely(sk_memalloc_socks()))
-		objp = __ac_get_obj(cachep, ac, flags, force_refill);
-	else
-		objp = ac->entry[--ac->avail];
-
-	return objp;
-}
-
-static void *__ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
+static void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
 								void *objp)
 {
 	if (unlikely(pfmemalloc_active)) {
@@ -1033,15 +1018,6 @@ static void *__ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
 			set_obj_pfmemalloc(&objp);
 	}
 
-	return objp;
-}
-
-static inline void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
-								void *objp)
-{
-	if (unlikely(sk_memalloc_socks()))
-		objp = __ac_put_obj(cachep, ac, objp);
-
 	ac->entry[ac->avail++] = objp;
 }