summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-02 19:27:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-02 19:27:00 -0800
commit859281ff370977f917ec2195f86a5bfccf1fc6d6 (patch)
treeea8b4d21187b5de7b61ca368701c89d3504d5f96 /mm
parent93bfbd71db4d2e01c05e219f285249a74808b1d4 (diff)
parentf58914e41473faf15e2dd66ad26be914da1bce71 (diff)
downloadlinux-859281ff370977f917ec2195f86a5bfccf1fc6d6.tar.gz
linux-859281ff370977f917ec2195f86a5bfccf1fc6d6.tar.bz2
linux-859281ff370977f917ec2195f86a5bfccf1fc6d6.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: fix per cpu kmem_cache_cpu array memory leak kmalloc: return NULL instead of link failure
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 6392ae5cc6b1..bdc9abb08a23 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1996,7 +1996,7 @@ static struct kmem_cache_cpu *alloc_kmem_cache_cpu(struct kmem_cache *s,
static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu)
{
if (c < per_cpu(kmem_cache_cpu, cpu) ||
- c > per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) {
+ c >= per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) {
kfree(c);
return;
}