Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754137AbZICBld (ORCPT ); Wed, 2 Sep 2009 21:41:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754093AbZICBlL (ORCPT ); Wed, 2 Sep 2009 21:41:11 -0400 Received: from mail.atheros.com ([12.36.123.2]:53916 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754036AbZICBlD (ORCPT ); Wed, 2 Sep 2009 21:41:03 -0400 From: "Luis R. Rodriguez" To: CC: , , "Luis R. Rodriguez" Subject: [PATCH 4/5] kmemleak: fix sparse warning over overshadowed flags Date: Wed, 2 Sep 2009 18:40:58 -0700 Message-ID: <1251942059-21448-5-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1251942059-21448-1-git-send-email-lrodriguez@atheros.com> References: <1251942059-21448-1-git-send-email-lrodriguez@atheros.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1274 Lines: 39 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 --- mm/kmemleak.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 7bb1d48..09ddf9c 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); goto out; } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/