diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 14:44:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 14:44:15 +0100 |
| commit | 072bdb8831c61e2c263151031c7d2d0b30fd7ddd (patch) | |
| tree | 84baa6b1e8123a47afaaaf6ac75823b5b4132440 /mm/slub.c | |
| parent | ae041342ea5b5423eb4d94eb7c8e49e5211ee0e5 (diff) | |
| parent | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (diff) | |
Merge branch 'x86/mm' into kmemcheck
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'mm/slub.c')
| -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 68208e0a5cab..dbcf61055433 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2009,7 +2009,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; } |