aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-06-08 16:46:46 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-08 20:23:32 -0400
commit3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 (patch)
tree4eac1f33e52f3efeaf4cbd181877ebd25f354ee1
parenta210906c1b791af1434323f69427286039c9c8b9 (diff)
slab: fix alien cache handling
cache_free_alien must be called regardless if we use alien caches or not. cache_free_alien() will do the right thing if there are no alien caches available. Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Paul Mundt <lethal@linux-sh.org> Acked-by: Pekka J Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 2e71a328aa09..6d65cf4e4b2e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3539,7 +3539,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp)
3539 check_irq_off(); 3539 check_irq_off();
3540 objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0)); 3540 objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));
3541 3541
3542 if (use_alien_caches && cache_free_alien(cachep, objp)) 3542 if (cache_free_alien(cachep, objp))
3543 return; 3543 return;
3544 3544
3545 if (likely(ac->avail < ac->limit)) { 3545 if (likely(ac->avail < ac->limit)) {