diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-02-02 04:18:49 -0500 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-02-02 04:18:49 -0500 |
commit | f58914e41473faf15e2dd66ad26be914da1bce71 (patch) | |
tree | 80c91ce14fc1ee4d1585ba665a41be6420cabcbc | |
parent | 1cf3eb2ff6b0844c678f2f48d0053b9d12b7da67 (diff) | |
parent | 3718909448116bf4411445468c58acc946379f92 (diff) |
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
@@ -1996,7 +1996,7 @@ static struct kmem_cache_cpu *alloc_kmem_cache_cpu(struct kmem_cache *s, | |||
1996 | static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu) | 1996 | static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu) |
1997 | { | 1997 | { |
1998 | if (c < per_cpu(kmem_cache_cpu, cpu) || | 1998 | if (c < per_cpu(kmem_cache_cpu, cpu) || |
1999 | c > per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) { | 1999 | c >= per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) { |
2000 | kfree(c); | 2000 | kfree(c); |
2001 | return; | 2001 | return; |
2002 | } | 2002 | } |