From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org> Cc: Catalin Marinas <catalin.marinas@arm.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Michael Ellerman <mpe@ellerman.id.au>, PowerPC <linuxppc-dev@lists.ozlabs.org> Subject: linux-next: build failure after merge of the mm tree Date: Tue, 13 Jun 2023 16:21:19 +1000 [thread overview] Message-ID: <20230613162119.4a7a7d3c@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2280 bytes --] Hi all, After merging the mm tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: In file included from arch/powerpc/include/asm/page.h:247, from arch/powerpc/include/asm/thread_info.h:13, from include/linux/thread_info.h:60, from include/asm-generic/preempt.h:5, from ./arch/powerpc/include/generated/asm/preempt.h:1, from include/linux/preempt.h:78, from include/linux/spinlock.h:56, from include/linux/ipc.h:5, from include/uapi/linux/sem.h:5, from include/linux/sem.h:5, from include/linux/compat.h:14, from arch/powerpc/kernel/asm-offsets.c:12: arch/powerpc/include/asm/page_32.h:16: warning: "ARCH_DMA_MINALIGN" redefined 16 | #define ARCH_DMA_MINALIGN L1_CACHE_BYTES | In file included from include/linux/time.h:5, from include/linux/compat.h:10: include/linux/cache.h:104: note: this is the location of the previous definition 104 | #define ARCH_DMA_MINALIGN __alignof__(unsigned long long) | (lots of theses) Caused by commit cc7335787e73 ("mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN") I have applied the following hack for today - we need something better. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 13 Jun 2023 16:07:16 +1000 Subject: [PATCH] fix up for "mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/cache.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index ae0a68a838e8..e9be1396dfd1 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -142,5 +142,14 @@ static inline void iccci(void *addr) } #endif /* !__ASSEMBLY__ */ + +#ifndef __powerpc64__ +#ifdef CONFIG_NOT_COHERENT_CACHE +#ifndef ARCH_DMA_MINALIGN +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES +#endif +#endif +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_CACHE_H */ -- 2.39.2 -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org> Cc: Catalin Marinas <catalin.marinas@arm.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, PowerPC <linuxppc-dev@lists.ozlabs.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: linux-next: build failure after merge of the mm tree Date: Tue, 13 Jun 2023 16:21:19 +1000 [thread overview] Message-ID: <20230613162119.4a7a7d3c@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2280 bytes --] Hi all, After merging the mm tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: In file included from arch/powerpc/include/asm/page.h:247, from arch/powerpc/include/asm/thread_info.h:13, from include/linux/thread_info.h:60, from include/asm-generic/preempt.h:5, from ./arch/powerpc/include/generated/asm/preempt.h:1, from include/linux/preempt.h:78, from include/linux/spinlock.h:56, from include/linux/ipc.h:5, from include/uapi/linux/sem.h:5, from include/linux/sem.h:5, from include/linux/compat.h:14, from arch/powerpc/kernel/asm-offsets.c:12: arch/powerpc/include/asm/page_32.h:16: warning: "ARCH_DMA_MINALIGN" redefined 16 | #define ARCH_DMA_MINALIGN L1_CACHE_BYTES | In file included from include/linux/time.h:5, from include/linux/compat.h:10: include/linux/cache.h:104: note: this is the location of the previous definition 104 | #define ARCH_DMA_MINALIGN __alignof__(unsigned long long) | (lots of theses) Caused by commit cc7335787e73 ("mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN") I have applied the following hack for today - we need something better. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 13 Jun 2023 16:07:16 +1000 Subject: [PATCH] fix up for "mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/cache.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index ae0a68a838e8..e9be1396dfd1 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -142,5 +142,14 @@ static inline void iccci(void *addr) } #endif /* !__ASSEMBLY__ */ + +#ifndef __powerpc64__ +#ifdef CONFIG_NOT_COHERENT_CACHE +#ifndef ARCH_DMA_MINALIGN +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES +#endif +#endif +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_CACHE_H */ -- 2.39.2 -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-06-13 6:22 UTC|newest] Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-13 6:21 Stephen Rothwell [this message] 2023-06-13 6:21 ` linux-next: build failure after merge of the mm tree Stephen Rothwell 2023-06-13 15:58 ` Catalin Marinas 2023-06-13 15:58 ` Catalin Marinas -- strict thread matches above, loose matches on Subject: below -- 2024-04-30 0:38 Stephen Rothwell 2024-04-30 2:23 ` Lance Yang 2024-04-23 0:22 Stephen Rothwell 2024-04-12 6:39 Stephen Rothwell 2024-04-11 23:14 Stephen Rothwell 2024-04-07 23:15 Stephen Rothwell 2024-04-08 1:44 ` Barry Song 2024-04-05 2:55 Stephen Rothwell 2024-03-28 4:34 Stephen Rothwell 2024-03-05 4:26 Stephen Rothwell 2024-03-05 6:39 ` Qi Zheng 2024-02-14 3:57 Stephen Rothwell 2024-02-14 15:19 ` Andrew Morton 2024-02-15 3:47 ` Stephen Rothwell 2024-02-07 6:17 Stephen Rothwell 2024-02-01 2:57 Stephen Rothwell 2024-02-01 8:35 ` Marco Elver 2024-01-25 3:29 Stephen Rothwell 2024-01-25 14:29 ` Baoquan He 2024-01-25 18:03 ` Stephen Rothwell 2024-01-24 23:23 Stephen Rothwell 2024-01-24 23:52 ` Suren Baghdasaryan 2024-01-25 2:40 ` Baoquan He 2024-01-23 23:05 Stephen Rothwell 2024-01-23 23:14 ` Suren Baghdasaryan 2023-12-21 7:38 Stephen Rothwell 2023-12-21 7:45 ` Changbin Du 2023-11-28 21:45 Stephen Rothwell 2023-11-28 22:45 ` Andrew Morton 2023-11-29 8:17 ` Dmitry Rokosov 2023-11-30 22:12 ` Stephen Rothwell 2023-11-27 3:44 Stephen Rothwell 2023-12-22 0:16 ` Stephen Rothwell 2023-12-22 6:26 ` Andrew Morton 2023-11-27 2:28 Stephen Rothwell 2023-11-27 3:48 ` Stephen Rothwell 2023-11-27 3:48 ` Stephen Rothwell 2023-11-30 22:04 ` Stephen Rothwell 2023-11-30 22:04 ` Stephen Rothwell 2023-11-30 22:32 ` Andrew Morton 2023-11-30 22:32 ` Andrew Morton 2023-11-30 22:39 ` Michael Ellerman 2023-11-30 22:39 ` Michael Ellerman 2023-11-30 22:52 ` Andrew Morton 2023-11-30 22:52 ` Andrew Morton 2023-12-01 3:12 ` Michael Ellerman 2023-12-01 3:12 ` Michael Ellerman 2023-12-07 12:38 ` Michael Ellerman 2023-10-03 22:50 Stephen Rothwell 2023-09-27 23:22 Stephen Rothwell 2023-09-28 6:47 ` Arnd Bergmann 2023-09-25 23:18 Stephen Rothwell 2023-08-22 22:52 Stephen Rothwell 2023-08-21 23:55 Stephen Rothwell 2023-08-22 1:11 ` Matthew Wilcox 2023-08-22 1:11 ` Matthew Wilcox 2023-08-22 1:22 ` Stephen Rothwell 2023-08-22 1:22 ` Stephen Rothwell 2023-08-22 1:34 ` Matthew Wilcox 2023-08-22 1:34 ` Matthew Wilcox 2023-08-22 4:00 ` Darrick J. Wong 2023-08-22 4:00 ` Darrick J. Wong 2023-08-22 20:20 ` Matthew Wilcox 2023-08-22 20:20 ` Matthew Wilcox 2023-08-22 7:12 ` Michael Ellerman 2023-08-22 7:12 ` Michael Ellerman 2023-08-08 4:40 Stephen Rothwell 2023-08-08 15:20 ` Eric DeVolder 2023-08-11 17:16 ` Eric DeVolder 2023-07-26 5:14 Stephen Rothwell 2023-07-26 13:22 ` Kuan-Ying Lee (李冠穎) 2023-07-26 4:53 Stephen Rothwell 2023-07-26 5:22 ` Aneesh Kumar K.V 2023-07-26 6:51 ` Stephen Rothwell 2023-07-19 4:32 Stephen Rothwell 2023-07-19 5:55 ` Alistair Popple 2023-07-18 0:02 Stephen Rothwell 2023-07-18 13:43 ` Andy Shevchenko 2023-07-18 17:34 ` Andrew Morton 2023-07-18 21:07 ` Andy Shevchenko 2023-07-17 23:40 Stephen Rothwell 2023-07-04 2:23 Stephen Rothwell 2023-07-04 2:32 ` Linus Torvalds 2023-07-04 5:51 ` Suren Baghdasaryan 2023-05-19 2:43 Stephen Rothwell 2023-05-19 8:19 ` Arnd Bergmann 2023-05-17 23:59 Stephen Rothwell 2023-03-06 2:54 Stephen Rothwell 2023-03-06 3:13 ` Andrew Morton 2023-03-06 0:52 Stephen Rothwell 2023-03-06 21:58 ` Stephen Rothwell 2023-02-07 4:37 Stephen Rothwell 2023-02-07 12:17 ` Jason Gunthorpe 2023-02-08 2:41 ` Stephen Rothwell 2023-02-07 14:25 ` David Howells 2023-01-30 5:14 Stephen Rothwell 2023-01-30 8:09 ` Christian Brauner 2023-02-26 22:18 ` Stephen Rothwell 2023-02-27 10:36 ` Christian Brauner 2023-01-27 6:36 Stephen Rothwell 2023-01-27 6:16 Stephen Rothwell 2023-01-27 6:16 ` Stephen Rothwell 2023-01-27 5:59 Stephen Rothwell 2023-01-27 13:11 ` Jan Kara 2023-01-31 21:47 ` Stephen Rothwell 2023-02-24 4:40 ` Stephen Rothwell 2023-02-24 6:01 ` Linus Torvalds 2023-02-24 20:36 ` Stephen Rothwell 2023-01-25 3:05 Stephen Rothwell 2022-12-16 1:26 Stephen Rothwell 2022-12-16 3:04 ` Andrew Morton 2022-12-16 0:21 Stephen Rothwell 2022-12-16 0:35 ` Andrew Morton 2022-12-16 1:03 ` Masami Hiramatsu 2022-11-22 6:53 Stephen Rothwell 2022-11-22 10:31 ` David Hildenbrand 2022-11-03 5:02 Stephen Rothwell 2022-11-02 3:55 Stephen Rothwell 2022-11-02 21:26 ` Andrew Morton 2022-10-18 1:24 Stephen Rothwell 2022-09-23 8:12 Stephen Rothwell 2022-09-23 8:15 ` David Hildenbrand 2022-09-23 7:55 Stephen Rothwell 2022-09-23 9:50 ` Michael Walle 2022-09-23 11:01 ` Naoya Horiguchi 2022-09-15 7:07 Stephen Rothwell 2022-09-15 16:37 ` Mike Kravetz 2022-09-15 20:06 ` Andrew Morton 2022-09-06 11:03 Stephen Rothwell 2022-09-06 12:05 ` Rob Clark 2022-09-06 18:05 ` Stephen Rothwell 2022-08-26 7:10 Stephen Rothwell 2022-08-26 7:32 ` Michal Hocko 2022-07-08 9:44 Stephen Rothwell 2022-07-08 15:17 ` Darrick J. Wong 2022-07-10 22:28 ` Stephen Rothwell 2022-05-12 9:38 Stephen Rothwell 2022-05-12 10:13 ` Baolin Wang 2022-05-12 11:07 ` Catalin Marinas 2022-05-12 11:13 ` Baolin Wang 2022-05-12 13:28 ` Catalin Marinas 2022-05-12 19:10 ` Andrew Morton 2022-05-13 7:18 ` Stephen Rothwell 2022-05-11 8:15 Stephen Rothwell 2022-05-11 8:27 ` Baolin Wang 2022-05-11 8:42 ` Baolin Wang 2022-05-11 23:28 ` Stephen Rothwell 2022-05-10 11:25 Stephen Rothwell 2022-05-05 21:37 Stephen Rothwell 2022-05-02 10:49 Stephen Rothwell 2022-05-02 11:19 ` Matthew Wilcox 2022-05-03 6:45 ` Stephen Rothwell
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=20230613162119.4a7a7d3c@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=akpm@linux-foundation.org \ --cc=catalin.marinas@arm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.