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

diff --git a/mm/slub.c b/mm/slub.c
index 6392ae5cc6b1e8972d98b059bee576aeb66d366c..bdc9abb08a230f2724ad842a0bc4928da0e48d23 100644 (file)
--- 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;
        }