Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0580a181 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Catalin Marinas
Browse files

kmemleak: fix sparse warning over overshadowed flags 



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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent a1084c87

mm/kmemleak.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

	}