summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-07 11:30:29 +0200
committerIngo Molnar <mingo@elte.hu>2010-05-07 11:30:30 +0200
commitcce913178118b0b36742eb7544c2b38a0c957ee7 (patch)
tree25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /mm
parentperf: Fix check at end of event search (diff)
parentperf: Fix exit() vs PERF_FORMAT_GROUP (diff)
downloadlinux-cce913178118b0b36742eb7544c2b38a0c957ee7.tar.xz
linux-cce913178118b0b36742eb7544c2b38a0c957ee7.zip
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-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;