From 64938e87c68072ce790e9d462cd38400f1ca95e5 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 8 Sep 2009 17:32:34 +0100 Subject: [PATCH] --- yaml --- r: 157423 b: refs/heads/master c: 0580a1819c584eb8b98f8701157667037e11153a h: refs/heads/master i: 157421: 76ee6b640c6a65464b82c3c9ee046ccfb170c261 157419: 591bd82635738ef9c2f16b1716cc21eb41995631 157415: 8bc9db7241885040e74e16fa8083f4303f1fc182 157407: 264d8e78cba2fec20327150db6a02d6520cfacd7 v: v3 --- [refs] | 2 +- trunk/mm/kmemleak.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5b71de95bebf..4fc4387ab182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1084c8779f5efa771c6896a0a4184900b4ab736 +refs/heads/master: 0580a1819c584eb8b98f8701157667037e11153a diff --git a/trunk/mm/kmemleak.c b/trunk/mm/kmemleak.c index b18d9ca578b9..ffd162abbe5e 100644 --- a/trunk/mm/kmemleak.c +++ b/trunk/mm/kmemleak.c @@ -555,6 +555,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, object->tree_node.last = ptr + size - 1; write_lock_irqsave(&kmemleak_lock, flags); + min_addr = min(min_addr, ptr); max_addr = max(max_addr, ptr + size); node = prio_tree_insert(&object_tree_root, &object->tree_node); @@ -565,14 +566,12 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, * random memory blocks. */ if (node != &object->tree_node) { - unsigned long flags; - kmemleak_stop("Cannot insert 0x%lx into the object search tree " "(already existing)\n", ptr); object = lookup_object(ptr, 1); - spin_lock_irqsave(&object->lock, flags); + spin_lock(&object->lock); dump_object_info(object); - spin_unlock_irqrestore(&object->lock, flags); + spin_unlock(&object->lock); goto out; }