From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Catalin Marinas <catalin.marinas@arm.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Vlastimil Babka <vbabka@suse.cz>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>,
Michal Simek <monstr@monstr.eu>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"linux-sh@vger.kernel.org" <linux-sh@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 0/3] Move the ARCH_DMA_MINALIGN definition to asm/cache.h
Date: Tue, 13 Jun 2023 16:42:40 +0000 [thread overview]
Message-ID: <5cc13519-e606-4dca-b22c-2dcb7bf06d32@csgroup.eu> (raw)
In-Reply-To: <20230613155245.1228274-1-catalin.marinas@arm.com>
Le 13/06/2023 à 17:52, Catalin Marinas a écrit :
> Hi,
>
> The ARCH_KMALLOC_MINALIGN reduction series defines a generic
> ARCH_DMA_MINALIGN in linux/cache.h:
>
> https://lore.kernel.org/r/20230612153201.554742-2-catalin.marinas@arm.com/
>
> Unfortunately, this causes a duplicate definition warning for
> microblaze, powerpc (32-bit only) and sh as these architectures define
> ARCH_DMA_MINALIGN in a different file than asm/cache.h. Move the macro
> to asm/cache.h to avoid this issue and also bring them in line with the
> other architectures.
What about mips ?
arch/mips/include/asm/mach-generic/kmalloc.h:#define ARCH_DMA_MINALIGN 128
arch/mips/include/asm/mach-ip32/kmalloc.h:#define ARCH_DMA_MINALIGN 32
arch/mips/include/asm/mach-ip32/kmalloc.h:#define ARCH_DMA_MINALIGN 128
arch/mips/include/asm/mach-n64/kmalloc.h:#define ARCH_DMA_MINALIGN
L1_CACHE_BYTES
arch/mips/include/asm/mach-tx49xx/kmalloc.h:#define ARCH_DMA_MINALIGN
L1_CACHE_BYTES
>
> Andrew, if the arch maintainers cc'ed are fine with such change, could
> you please take these three patches together with the
> ARCH_KMALLOC_MINALIGN series?
>
> Thank you.
>
> Catalin Marinas (3):
> powerpc: Move the ARCH_DMA_MINALIGN definition to asm/cache.h
> microblaze: Move the ARCH_{DMA,SLAB}_MINALIGN definitions to
> asm/cache.h
> sh: Move the ARCH_DMA_MINALIGN definition to asm/cache.h
>
> arch/microblaze/include/asm/cache.h | 5 +++++
> arch/microblaze/include/asm/page.h | 5 -----
> arch/powerpc/include/asm/cache.h | 4 ++++
> arch/powerpc/include/asm/page_32.h | 4 ----
> arch/sh/include/asm/cache.h | 6 ++++++
> arch/sh/include/asm/page.h | 6 ------
> 6 files changed, 15 insertions(+), 15 deletions(-)
>
next prev parent reply other threads:[~2023-06-13 16:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 15:52 [PATCH 0/3] Move the ARCH_DMA_MINALIGN definition to asm/cache.h Catalin Marinas
2023-06-13 15:52 ` [PATCH 1/3] powerpc: " Catalin Marinas
2023-06-13 15:52 ` [PATCH 2/3] microblaze: Move the ARCH_{DMA,SLAB}_MINALIGN definitions " Catalin Marinas
2023-06-13 15:52 ` [PATCH 3/3] sh: Move the ARCH_DMA_MINALIGN definition " Catalin Marinas
2023-06-13 16:42 ` Christophe Leroy [this message]
2023-06-13 19:49 ` [PATCH 0/3] " Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5cc13519-e606-4dca-b22c-2dcb7bf06d32@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=vbabka@suse.cz \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox