diff --git a/[refs] b/[refs] index a7206ea88b55..130c1665a272 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4de0b1ee1b630318553248c4cfc78358720a5c84 +refs/heads/master: 693f7d362055261882659475d2ef022e32edbff1 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index af5c5237e11a..c32af7e7581e 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -979,7 +979,8 @@ static void __drain_alien_cache(struct kmem_cache *cachep, * That way we could avoid the overhead of putting the objects * into the free lists and getting them back later. */ - transfer_objects(rl3->shared, ac, ac->limit); + if (rl3->shared) + transfer_objects(rl3->shared, ac, ac->limit); free_block(cachep, ac->entry, ac->avail, node); ac->avail = 0;