summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-06-08 13:46:46 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-08 17:23:32 -0700
commit3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 (patch)
tree4eac1f33e52f3efeaf4cbd181877ebd25f354ee1 /mm
parenta210906c1b791af1434323f69427286039c9c8b9 (diff)
downloadlinux-3.10-3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80.tar.gz
linux-3.10-3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80.tar.bz2
linux-3.10-3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80.zip
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 2e71a328aa0..6d65cf4e4b2 100644
--- a/mm/slab.c
+++ b/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)) {