Merge branches 'slab/next' and 'slub/partial' into slab/for-linus
Pekka Enberg [Wed, 26 Oct 2011 15:09:12 +0000 (18:09 +0300)]
1  2  3 
include/linux/mm_types.h
mm/slub.c
tools/slub/slabinfo.c

Simple merge
diff --cc 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);
                }
        }
Simple merge