Re: [PATCH v2 4/5] kmemleak: fix sparse warning over overshadowedflags

From: Catalin Marinas
Date: Thu Sep 03 2009 - 12:55:29 EST


On Thu, 2009-09-03 at 01:35 -0400, Luis R. Rodriguez wrote:
> 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@xxxxxxxxxxx>
> ---
> mm/kmemleak.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/kmemleak.c b/mm/kmemleak.c
> index 58c07b1..24e7a84 100644
> --- a/mm/kmemleak.c
> +++ b/mm/kmemleak.c
> @@ -509,14 +509,14 @@ static void create_object(unsigned long ptr, size_t size, int min_count,
> * random memory blocks.
> */
> if (node != &object->tree_node) {
> - unsigned long flags;
> + unsigned long flags_object;
>
> 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_irqsave(&object->lock, flags_object);
> dump_object_info(object);
> - spin_unlock_irqrestore(&object->lock, flags);
> + spin_unlock_irqrestore(&object->lock, flags_object);

As Pekka said, we only need spin_lock() variant here as the interrupts
are already disabled.

--
Catalin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/