summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang, Yanmin <yanmin_zhang@linux.intel.com>2010-04-01 11:32:30 +0200
committerPekka Enberg <penberg@cs.helsinki.fi>2010-05-05 20:12:19 +0200
commit111c7d82436db4c7673922b6ba021cebb7d26dd8 (patch)
treee0faa1eb3793b27fa5a05b8e0b1311f83f16e5f6
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff)
downloadlinux-111c7d82436db4c7673922b6ba021cebb7d26dd8.tar.xz
linux-111c7d82436db4c7673922b6ba021cebb7d26dd8.zip
slub: Fix bad boundary check in init_kmem_cache_nodes()
Function init_kmem_cache_nodes is incorrect when checking upper limitation of kmalloc_caches. The breakage was introduced by commit 91efd773c74bb26b5409c85ad755d536448e229c ("dma kmalloc handling fixes"). Acked-by: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
-rw-r--r--mm/slub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 7d6c8b1ccf63..d2a54fe71ea2 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2153,7 +2153,7 @@ static int init_kmem_cache_nodes(struct kmem_cache *s, gfp_t gfpflags)
int local_node;
if (slab_state >= UP && (s < kmalloc_caches ||
- s > kmalloc_caches + KMALLOC_CACHES))
+ s >= kmalloc_caches + KMALLOC_CACHES))
local_node = page_to_nid(virt_to_page(s));
else
local_node = 0;