diff --git a/[refs] b/[refs] index d2027a560886..8d6e5504e99a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a210906c1b791af1434323f69427286039c9c8b9 +refs/heads/master: 3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 2e71a328aa09..6d65cf4e4b2e 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3539,7 +3539,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp) check_irq_off(); objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0)); - if (use_alien_caches && cache_free_alien(cachep, objp)) + if (cache_free_alien(cachep, objp)) return; if (likely(ac->avail < ac->limit)) {