Skip to content

Commit

Permalink
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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
  • Loading branch information
Linus Torvalds committed Dec 6, 2010
2 parents 31c67c7 + 37d5744 commit 771f8bc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 771f8bc

Please sign in to comment.