From: Pekka Enberg <penberg@kernel.org>
Date: Wed, 26 Oct 2011 15:09:12 +0000 (+0300)
Subject: Merge branches 'slab/next' and 'slub/partial' into slab/for-linus
X-Git-Tag: v3.2-rc1~152^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e182a345d40deba7c3165a2857812bf403818319;p=linux-block.git

Merge branches 'slab/next' and 'slub/partial' into slab/for-linus
---

e182a345d40deba7c3165a2857812bf403818319
diff --cc mm/slub.c
index 7c54fe83a90c,943f4906131b,e06f72c81e53..95215aa6a75e
--- a/mm/slub.c
+++ b/mm/slub.c
@@@@ -2377,7 -2351,7 -2536,7 +2510,7 @@@@ static void __slab_free(struct kmem_cac
   		 */
   		if (unlikely(!prior)) {
   			remove_full(s, page);
-  			add_partial(n, page, 1);
  -			add_partial(n, page, 0);
+ +			add_partial(n, page, DEACTIVATE_TO_TAIL);
   			stat(s, FREE_ADD_PARTIAL);
   		}
   	}