diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-02-02 10:18:49 +0100 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-02-02 10:18:49 +0100 |
| commit | f58914e41473faf15e2dd66ad26be914da1bce71 (patch) | |
| tree | 80c91ce14fc1ee4d1585ba665a41be6420cabcbc | |
| parent | kmalloc: return NULL instead of link failure (diff) | |
| parent | slub: fix per cpu kmem_cache_cpu array memory leak (diff) | |
| download | linux-f58914e41473faf15e2dd66ad26be914da1bce71.tar.xz linux-f58914e41473faf15e2dd66ad26be914da1bce71.zip | |
Merge branches 'topic/slab/fixes' and 'topic/slub/fixes' into for-linus
| -rw-r--r-- | mm/slub.c | 2 |
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; } |