From patchwork Wed May 17 15:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 95348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp1101528rwl; Wed, 17 May 2023 08:28:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6YHkWTz+3REASwztwBwVb3MurOihT9Yj6SOcylITSS8aVInwQ2xsqMflHyIRjgg/TqM/mi X-Received: by 2002:a05:6a00:1791:b0:63b:5501:6795 with SMTP id s17-20020a056a00179100b0063b55016795mr1819400pfg.24.1684337324563; Wed, 17 May 2023 08:28:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684337324; cv=none; d=google.com; s=arc-20160816; b=svWG84iEuff42uCCIdZWTnAso1mXrPryDs9+JCeJPjWIe8FyCW3o7A753aaYecw4wy 2OGqVAUHuvNzaLRTesCFYZCuevwXNV7bw1w17ak0rvkg12hnsplTOwQ5WrgI7RU2q0nE hwCle8g0KVQy1+XDET6orIHtdnqyG3hy5ZfgtE8+jCz7k5EVhshXv+bvNd5mNjP25g+2 z3ZZyXTaDfeagwZIjENR3bdhFP7BZuL9Fq3V6RCW6YPopt3IgF1nmBxEkVHSvEs+i+0N 179OApG3YpaxLRhp2q3AprACmwBoqvO3rj6+b+pk0uP4/OSkSlxMPwfxVjmJ0/9UUsCz hcbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=RbHR3p/aSwGiwoZdp2CXqzfCqmJLbldvSD60wsj1Fzs=; b=g4bPS0CqE5Im9Nqba99sSsY1RuTJxvmc/M47DEUWjEzDIinN7JWFpW9jbo8a3iyZrW 8ZS9rtiPCi4U39g6XTOZly+3/2M4C5x2Kp8CdkzTfRz8Ct+79t4p7KH+NgYAB6SqNMrX FS+64LKdmZHzZgogmCtp/z8RLR6/h0uVjeUrdfBoaHLLAOAmkfyey09SMxYI7cvDAkCf wKQkVXMH7NR9TA7m8S7ormN6rDiN3kz82yyq4G4ZYlhs43Or/mRPYB0wJN9q7l/6ETxd BDvI7XvjlbkewA2NfYeaZr/ungxCQOZZZTVFnZYs7M8nId7Z/wBrKukuo6ED3H0taGwg H2ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=jHNY7YUQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t16-20020aa79470000000b0062d7d3c6cadsi22722611pfq.333.2023.05.17.08.28.29; Wed, 17 May 2023 08:28:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=jHNY7YUQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231376AbjEQPKW (ORCPT + 99 others); Wed, 17 May 2023 11:10:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230313AbjEQPKT (ORCPT ); Wed, 17 May 2023 11:10:19 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE0F835A5; Wed, 17 May 2023 08:10:01 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9659c5b14d8so136119366b.3; Wed, 17 May 2023 08:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684336200; x=1686928200; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RbHR3p/aSwGiwoZdp2CXqzfCqmJLbldvSD60wsj1Fzs=; b=jHNY7YUQq7T5u7nBwuVtfqJOHyeYlzKXv+ooTfcFyKORavnxs8v9xgsa5X09yq5+oF 0yJlPl+gNCXgkVEEA1lmjzsnM+FeXzZ8RMTq9UXaZF514rYjhkALhBPZh//eg3CdVYoD sDDShdi+8y6B/+2XvFQHvkJP4AyFxtpr1Wpp+YEymFNole9yPq8mWDQoEo2dZJ0+8PEY p4ayoD9o/wofATVFsQeMUNH2yNnSPfZqRQTwK7fmnyLjmL1O8g3m1SymuPfIlS1ae7d6 KlIampzTO1eXgcl9QqAkTW4Q3njVKtnTadDUUhwiTF7CPE5yx1JgyREVP2ueLR2R+NCL zAJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684336200; x=1686928200; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RbHR3p/aSwGiwoZdp2CXqzfCqmJLbldvSD60wsj1Fzs=; b=D45EqTWkh863VhYWGpsu2+VHKeQNxmiflzHIvnsLSDrheXVNj8sgFmSj3jqE00XCcb bGfGrfkTIiS8OmgTiLWnDgs8CodCDhYmSmoV4CJZ9hLmJP599SqNiwKRwJdr5rj0KScV 9gNVvVL4tQU/R+2XGNyKltXzAAGs2UrHnU5d1uSMnv6Xp0OYhRPTIr8KI85897z9DPR/ 18jQoHFBL8mPrYfvG3aIxvP4GmgSaEjp2xTSegDFVSYQoDaUfJTkx6Iz2NVsR0HZrl/2 alHAe3FmF1i58f1+K+jLmhqxBzB6nNbCxzqirA+xWy/n23TvJygYCLAjucI6U3/PORMZ RvnA== X-Gm-Message-State: AC+VfDy+nCXjg8HTtaH0D2pvurovIUE4QEmt7VRfa2hpqThZ/JPoy9Tp TU5P0exifsRyBncM9HhRuCk= X-Received: by 2002:a17:907:948e:b0:96a:ec5c:685b with SMTP id dm14-20020a170907948e00b0096aec5c685bmr12951001ejc.29.1684336199815; Wed, 17 May 2023 08:09:59 -0700 (PDT) Received: from localhost.localdomain ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id e26-20020a170906845a00b00965cd15c9bbsm12413901ejy.62.2023.05.17.08.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 08:09:59 -0700 (PDT) From: Uros Bizjak To: loongarch@lists.linux.dev, linux-mips@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Uros Bizjak , Charlemagne Lasse , Huacai Chen , WANG Xuerui , Jiaxun Yang , Jun Yi , Thomas Bogendoerfer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH] locking/arch: Avoid variable shadowing in local_try_cmpxchg() Date: Wed, 17 May 2023 17:09:40 +0200 Message-Id: <20230517150940.172430-1-ubizjak@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766155693916032129?= X-GMAIL-MSGID: =?utf-8?q?1766155693916032129?= Several architectures define arch_try_local_cmpxchg macro using internal temporary variables named __old or _old. Uglify equally named variable in local_try_cmpxchg() with additional underscore to avoid variable shadowing warning. Fixes: d994f2c8e241 ("locking/arch: Wire up local_try_cmpxchg()") Reported-by: Charlemagne Lasse Closes: https://lore.kernel.org/lkml/CAFGhKbyxtuk=LoW-E3yLXgcmR93m+Dfo5-u9oQA_YC5Fcy_t9g@mail.gmail.com/ Cc: Huacai Chen Cc: WANG Xuerui Cc: Jiaxun Yang Cc: Jun Yi Cc: Thomas Bogendoerfer Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Signed-off-by: Uros Bizjak --- arch/loongarch/include/asm/local.h | 4 ++-- arch/mips/include/asm/local.h | 4 ++-- arch/x86/include/asm/local.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/loongarch/include/asm/local.h b/arch/loongarch/include/asm/local.h index 83e995b30e47..4c6e4ed23433 100644 --- a/arch/loongarch/include/asm/local.h +++ b/arch/loongarch/include/asm/local.h @@ -63,8 +63,8 @@ static inline long local_cmpxchg(local_t *l, long old, long new) static inline bool local_try_cmpxchg(local_t *l, long *old, long new) { - typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; - return try_cmpxchg_local(&l->a.counter, __old, new); + typeof(l->a.counter) *___old = (typeof(l->a.counter) *) old; + return try_cmpxchg_local(&l->a.counter, ___old, new); } #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n))) diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h index 5daf6fe8e3e9..de276e2ebb64 100644 --- a/arch/mips/include/asm/local.h +++ b/arch/mips/include/asm/local.h @@ -101,8 +101,8 @@ static __inline__ long local_cmpxchg(local_t *l, long old, long new) static __inline__ bool local_try_cmpxchg(local_t *l, long *old, long new) { - typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; - return try_cmpxchg_local(&l->a.counter, __old, new); + typeof(l->a.counter) *___old = (typeof(l->a.counter) *) old; + return try_cmpxchg_local(&l->a.counter, ___old, new); } #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n))) diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h index 56d4ef604b91..36cf5ca83ccb 100644 --- a/arch/x86/include/asm/local.h +++ b/arch/x86/include/asm/local.h @@ -127,8 +127,8 @@ static inline long local_cmpxchg(local_t *l, long old, long new) static inline bool local_try_cmpxchg(local_t *l, long *old, long new) { - typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; - return try_cmpxchg_local(&l->a.counter, __old, new); + typeof(l->a.counter) *___old = (typeof(l->a.counter) *) old; + return try_cmpxchg_local(&l->a.counter, ___old, new); } /* Always has a lock prefix */