diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 16:45:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 16:45:02 -0800 |
| commit | 771f8bc71c31c6bd103cdec283012253f352ab1c (patch) | |
| tree | 0a9c613397dca2644dda9c41aab2f6414bd34cd6 | |
| parent | 31c67c755363c7e7821221e72f8594ab8995764d (diff) | |
| parent | 37d57443d5d810c6ef49e93586b046e7d4774818 (diff) | |
| download | blackbird-op-linux-771f8bc71c31c6bd103cdec283012253f352ab1c.tar.gz blackbird-op-linux-771f8bc71c31c6bd103cdec283012253f352ab1c.zip | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix a crash during slabinfo -v
| -rw-r--r-- | mm/slub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index 981fb730aa04..bec0e355fbad 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3401,13 +3401,13 @@ static int validate_slab(struct kmem_cache *s, struct page *page, for_each_free_object(p, s, page->freelist) { set_bit(slab_index(p, s, addr), map); - if (!check_object(s, page, p, 0)) + if (!check_object(s, page, p, SLUB_RED_INACTIVE)) return 0; } for_each_object(p, s, addr, page->objects) if (!test_bit(slab_index(p, s, addr), map)) - if (!check_object(s, page, p, 1)) + if (!check_object(s, page, p, SLUB_RED_ACTIVE)) return 0; return 1; } |
