From e734313f02a3593f27625ee55254962c8105ca51 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Fri, 15 Feb 2008 23:45:24 -0800 Subject: [PATCH] --- yaml --- r: 86680 b: refs/heads/master c: d692ef6dcd20da60786470654410e85f29c2ddd9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fc2a135b5693..d0574ca8be0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e153362a50a34439718a938a851bba977116e19a +refs/heads/master: d692ef6dcd20da60786470654410e85f29c2ddd9 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index d7d0d866b6b2..0a5a1001590b 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -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; } @@ -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 */