[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <24761ba0-99bc-4637-a76c-f29be10a1753@linaro.org>
Date: Sat, 5 Oct 2024 10:13:49 -0700
From: Richard Henderson <richard.henderson@...aro.org>
To: Arnd Bergmann <arnd@...nel.org>, linux-mm@...ck.org
Cc: Arnd Bergmann <arnd@...db.de>, "Jason A. Donenfeld" <Jason@...c4.com>,
Alexander Viro <viro@...iv.linux.org.uk>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Andreas Larsson <andreas@...sler.com>,
Andrew Morton <akpm@...ux-foundation.org>, Ard Biesheuvel <ardb@...nel.org>,
Christian Brauner <brauner@...nel.org>, Christoph Hellwig <hch@....de>,
Christophe Leroy <christophe.leroy@...roup.eu>,
Damien Le Moal <dlemoal@...nel.org>, David Hildenbrand <david@...hat.com>,
Greg Ungerer <gerg@...ux-m68k.org>, Helge Deller <deller@....de>,
Kees Cook <kees@...nel.org>, "Liam R . Howlett" <Liam.Howlett@...cle.com>,
Lorenzo Stoakes <lorenzo.stoakes@...cle.com>,
Matt Turner <mattst88@...il.com>, Max Filippov <jcmvbkbc@...il.com>,
Michael Ellerman <mpe@...erman.id.au>, Michal Hocko <mhocko@...e.com>,
Nicholas Piggin <npiggin@...il.com>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Vladimir Murzin <vladimir.murzin@....com>, Vlastimil Babka <vbabka@...e.cz>,
linux-stm32@...md-mailman.stormreply.com, linux-kernel@...r.kernel.org,
linux-mips@...r.kernel.org, linux-parisc@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org, linux-arch@...r.kernel.org
Subject: Re: [PATCH 3/5] asm-generic: use asm-generic/mman-common.h on mips
and xtensa
On 9/25/24 14:06, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@...db.de>
>
> mips and xtensa have almost the same asm/mman.h, aside from an
> unintentional difference in MAP_UNINITIALIZED that has no effect in
> practice.
>
> Now that the MAP_* flags are moved out of asm-generic/mman-common.h,
> the only difference from the its contents and the mips/xtensa version
> is the PROT_SEM definition that is one bit off from the rest.
>
> Make the generic PROT_SEM definition conditional on it already being
> defined and then include that header from both architectures, to
> remove the bulk of the contents.
>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
> arch/alpha/include/uapi/asm/mman.h | 2 +
> arch/mips/include/uapi/asm/mman.h | 65 +------------------------
> arch/parisc/include/uapi/asm/mman.h | 3 ++
> arch/xtensa/include/uapi/asm/mman.h | 66 +-------------------------
> include/uapi/asm-generic/mman-common.h | 2 +
> 5 files changed, 9 insertions(+), 129 deletions(-)
>
> diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h
> index 8946a13ce858..1f1c03c047ce 100644
> --- a/arch/alpha/include/uapi/asm/mman.h
> +++ b/arch/alpha/include/uapi/asm/mman.h
> @@ -5,7 +5,9 @@
> #define PROT_READ 0x1 /* page can be read */
> #define PROT_WRITE 0x2 /* page can be written */
> #define PROT_EXEC 0x4 /* page can be executed */
> +#ifndef PROT_SEM /* different on mips and xtensa */
> #define PROT_SEM 0x8 /* page may be used for atomic ops */
> +#endif
Surely not conditional within arch/alpha/...
> --- a/include/uapi/asm-generic/mman-common.h
> +++ b/include/uapi/asm-generic/mman-common.h
> @@ -10,7 +10,9 @@
> #define PROT_READ 0x1 /* page can be read */
> #define PROT_WRITE 0x2 /* page can be written */
> #define PROT_EXEC 0x4 /* page can be executed */
> +#ifndef PROT_SEM /* different on mips and xtensa */
> #define PROT_SEM 0x8 /* page may be used for atomic ops */
> +#endif
... only conditional here in asm-generic.
r~
Powered by blists - more mailing lists