Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86680
b: refs/heads/master
c: d692ef6
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Lameter committed Mar 3, 2008
1 parent 671d16f commit e734313
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e153362a50a34439718a938a851bba977116e19a
refs/heads/master: d692ef6dcd20da60786470654410e85f29c2ddd9
4 changes: 2 additions & 2 deletions trunk/mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ static int alloc_debug_processing(struct kmem_cache *s, struct page *page,
if (!check_slab(s, page))
goto bad;

if (object && !on_freelist(s, page, object)) {
if (!on_freelist(s, page, object)) {
object_err(s, page, object, "Object already allocated");
goto bad;
}
Expand All @@ -862,7 +862,7 @@ static int alloc_debug_processing(struct kmem_cache *s, struct page *page,
goto bad;
}

if (object && !check_object(s, page, object, 0))
if (!check_object(s, page, object, 0))
goto bad;

/* Success perform special debug activities for allocs */
Expand Down

0 comments on commit e734313

Please sign in to comment.