Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-08 14:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kmemleak: fix sparse warning over overshadowed flags

Browse Source 
A secondary irq_save is not required as a locking before it was
already disabling irqs.

This fixes this sparse warning:
mm/kmemleak.c:512:31: warning: symbol 'flags' shadows an earlier one
mm/kmemleak.c:448:23: originally declared here

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Luis R. Rodriguez 2009-09-08 17:32:34 +01:00 committed by Catalin Marinas
parent a1084c8779
commit 0580a1819c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/kmemleak.c
View File

@ -555,6 +555,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
object->tree_node.last = ptr + size - 1; object->tree_node.last = ptr + size - 1;
write_lock_irqsave(&kmemleak_lock, flags); write_lock_irqsave(&kmemleak_lock, flags);
min_addr = min(min_addr, ptr); min_addr = min(min_addr, ptr);
max_addr = max(max_addr, ptr + size); max_addr = max(max_addr, ptr + size);
node = prio_tree_insert(&object_tree_root, &object->tree_node); 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. * random memory blocks.
*/ */
if (node != &object->tree_node) { if (node != &object->tree_node) {
unsigned long flags;
kmemleak_stop("Cannot insert 0x%lx into the object search tree " kmemleak_stop("Cannot insert 0x%lx into the object search tree "
"(already existing)\n", ptr); "(already existing)\n", ptr);
object = lookup_object(ptr, 1); object = lookup_object(ptr, 1);
spin_lock_irqsave(&object->lock, flags); spin_lock(&object->lock);
dump_object_info(object); dump_object_info(object);
spin_unlock_irqrestore(&object->lock, flags); spin_unlock(&object->lock);
goto out; goto out;
} }