diff options
author | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:07:23 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:07:23 -0700 |
commit | df760137ad3cbfa15ceed42478f81bff01b6e799 (patch) | |
tree | be939c9d11094858d74141a4c62cb23f477754d8 /mm/slub.c | |
parent | 754b8e653412106ff613f4750b197f807fcd8347 (diff) | |
parent | de997718b64df2f766736f23f8557da450b83a25 (diff) | |
download | blackbird-op-linux-df760137ad3cbfa15ceed42478f81bff01b6e799.tar.gz blackbird-op-linux-df760137ad3cbfa15ceed42478f81bff01b6e799.zip |
Merge branch 'omap-boards' into omap-for-linus
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 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; |