aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-26 11:30:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-26 11:30:17 -0700
commit5254149f6c4e938fea3735183434e208097bd188 (patch)
tree452fbfbcd405d4d97d520d561a7c0236398e228f /mm/slub.c
parent8f404faa72f4e458e7bd81ac75ce55ae829e953d (diff)
parentec1f5eeeb5a79a0d48036de649a3498da42db565 (diff)
downloadkernel_samsung_smdk4412-5254149f6c4e938fea3735183434e208097bd188.zip
kernel_samsung_smdk4412-5254149f6c4e938fea3735183434e208097bd188.tar.gz
kernel_samsung_smdk4412-5254149f6c4e938fea3735183434e208097bd188.tar.bz2
Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm: slab: fix cache_cache bootstrap in kmem_cache_init() count_partial() is not used if !SLUB_DEBUG and !CONFIG_SLABINFO
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c
index ca71d5b..b72bc98 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2685,6 +2685,7 @@ void kfree(const void *x)
}
EXPORT_SYMBOL(kfree);
+#if defined(SLUB_DEBUG) || defined(CONFIG_SLABINFO)
static unsigned long count_partial(struct kmem_cache_node *n)
{
unsigned long flags;
@@ -2697,6 +2698,7 @@ static unsigned long count_partial(struct kmem_cache_node *n)
spin_unlock_irqrestore(&n->list_lock, flags);
return x;
}
+#endif
/*
* kmem_cache_shrink removes empty slabs from the partial lists and sorts