Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 14 Jan 2021 18:30:31 +0000
To:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
From:   Alexander Lobakin <alobakin@pm.me>
Cc:     Alexander Lobakin <alobakin@pm.me>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        Andrew Morton <akpm@linux-foundation.org>,
        Bibo Mao <maobibo@loongson.cn>,
        Anshuman Khandual <anshuman.khandual@arm.com>,
        Paul Burton <paulburton@kernel.org>,
        Mike Rapoport <rppt@kernel.org>,
        Guoyun Sun <sunguoyun@loongson.cn>, linux-mips@vger.kernel.org,
        linux-kernel@vger.kernel.org
Reply-To: Alexander Lobakin <alobakin@pm.me>
Subject: [PATCH mips-next 2/2] MIPS: pgtable: fix -Wshadow in asm/pgtable.h
Message-ID: <20210114183001.110729-2-alobakin@pm.me>
In-Reply-To: <20210114183001.110729-1-alobakin@pm.me>
References: <20210114182905.110574-1-alobakin@pm.me> <20210114183001.110729-1-alobakin@pm.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Solves the following repetitive warning when building with -Wshadow:

In file included from ./include/linux/pgtable.h:6,
                 from ./include/linux/mm.h:33,
                 from ./include/linux/dax.h:6,
                 from ./include/linux/mempolicy.h:11,
                 from kernel/fork.c:34:
./arch/mips/include/asm/mmu_context.h: In function =E2=80=98switch_mm=
=E2=80=99:
./arch/mips/include/asm/pgtable.h:97:16: warning: declaration of =E2=80=
=98flags=E2=80=99 shadows a previous local [-Wshadow]
   97 |  unsigned long flags;      \
      |                ^~~~~
./arch/mips/include/asm/mmu_context.h:162:2: note: in expansion of macro =
=E2=80=98htw_stop=E2=80=99
  162 |  htw_stop();
      |  ^~~~~~~~
In file included from kernel/fork.c:102:
./arch/mips/include/asm/mmu_context.h:159:16: note: shadowed declaration is=
 here
  159 |  unsigned long flags;
      |                ^~~~~

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 arch/mips/include/asm/pgtable.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtabl=
e.h
index 4f9c37616d42..4d3ab682d093 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -94,31 +94,31 @@ extern void paging_init(void);
=20
 #define htw_stop()=09=09=09=09=09=09=09\
 do {=09=09=09=09=09=09=09=09=09\
-=09unsigned long flags;=09=09=09=09=09=09\
+=09unsigned long __flags;=09=09=09=09=09=09\
 =09=09=09=09=09=09=09=09=09\
 =09if (cpu_has_htw) {=09=09=09=09=09=09\
-=09=09local_irq_save(flags);=09=09=09=09=09\
+=09=09local_irq_save(__flags);=09=09=09=09\
 =09=09if(!raw_current_cpu_data.htw_seq++) {=09=09=09\
 =09=09=09write_c0_pwctl(read_c0_pwctl() &=09=09\
 =09=09=09=09       ~(1 << MIPS_PWCTL_PWEN_SHIFT));=09\
 =09=09=09back_to_back_c0_hazard();=09=09=09\
 =09=09}=09=09=09=09=09=09=09\
-=09=09local_irq_restore(flags);=09=09=09=09\
+=09=09local_irq_restore(__flags);=09=09=09=09\
 =09}=09=09=09=09=09=09=09=09\
 } while(0)
=20
 #define htw_start()=09=09=09=09=09=09=09\
 do {=09=09=09=09=09=09=09=09=09\
-=09unsigned long flags;=09=09=09=09=09=09\
+=09unsigned long __flags;=09=09=09=09=09=09\
 =09=09=09=09=09=09=09=09=09\
 =09if (cpu_has_htw) {=09=09=09=09=09=09\
-=09=09local_irq_save(flags);=09=09=09=09=09\
+=09=09local_irq_save(__flags);=09=09=09=09\
 =09=09if (!--raw_current_cpu_data.htw_seq) {=09=09=09\
 =09=09=09write_c0_pwctl(read_c0_pwctl() |=09=09\
 =09=09=09=09       (1 << MIPS_PWCTL_PWEN_SHIFT));=09\
 =09=09=09back_to_back_c0_hazard();=09=09=09\
 =09=09}=09=09=09=09=09=09=09\
-=09=09local_irq_restore(flags);=09=09=09=09\
+=09=09local_irq_restore(__flags);=09=09=09=09\
 =09}=09=09=09=09=09=09=09=09\
 } while(0)
=20
--=20
2.30.0