diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 11:18:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 11:18:16 -0700 |
| commit | 65be2f501f5b31208a963713e6702d40e8e7863d (patch) | |
| tree | b3290a3352d30416c6960d6feb5cb7fdb59436b2 | |
| parent | 5f233706592fcce7df57e12674461c349b8f591d (diff) | |
| parent | 111c7d82436db4c7673922b6ba021cebb7d26dd8 (diff) | |
| download | blackbird-op-linux-65be2f501f5b31208a963713e6702d40e8e7863d.tar.gz blackbird-op-linux-65be2f501f5b31208a963713e6702d40e8e7863d.zip | |
Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix bad boundary check in init_kmem_cache_nodes()
| -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; |
