Commit f58914e4 authored by Pekka Enberg's avatar Pekka Enberg

Merge branches 'topic/slab/fixes' and 'topic/slub/fixes' into for-linus

parents 1cf3eb2f 37189094
...@@ -1996,7 +1996,7 @@ static struct kmem_cache_cpu *alloc_kmem_cache_cpu(struct kmem_cache *s, ...@@ -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) static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu)
{ {
if (c < per_cpu(kmem_cache_cpu, 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); kfree(c);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment