The quilt patch titled
Subject: microblaze: move the ARCH_{DMA,SLAB}_MINALIGN definitions to asm/cache.h
has been removed from the -mm tree. Its filename was
microblaze-move-the-arch_dmaslab_minalign-definitions-to-asm-cacheh.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Catalin Marinas <catalin.marinas@xxxxxxx>
Subject: microblaze: move the ARCH_{DMA,SLAB}_MINALIGN definitions to asm/cache.h
Date: Tue, 13 Jun 2023 16:52:44 +0100
The microblaze architecture defines ARCH_DMA_MINALIGN in asm/page.h. Move
it to asm/cache.h to allow a generic ARCH_DMA_MINALIGN definition in
linux/cache.h without redefine errors/warnings.
While at it, also move ARCH_SLAB_MINALIGN to asm/cache.h for
consistency.
Link: https://lkml.kernel.org/r/20230613155245.1228274-3-catalin.marinas@xxxxxxx
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Michal Simek <monstr@xxxxxxxxx>
Cc: Christophe Leroy <christophe.leroy@xxxxxxxxxx>
Cc: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Cc: kernel test robot <lkp@xxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
Cc: Rich Felker <dalias@xxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/microblaze/include/asm/cache.h | 5 +++++
arch/microblaze/include/asm/page.h | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
--- a/arch/microblaze/include/asm/cache.h~microblaze-move-the-arch_dmaslab_minalign-definitions-to-asm-cacheh
+++ a/arch/microblaze/include/asm/cache.h
@@ -18,4 +18,9 @@
#define SMP_CACHE_BYTES L1_CACHE_BYTES
+/* MS be sure that SLAB allocates aligned objects */
+#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
+
+#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
+
#endif /* _ASM_MICROBLAZE_CACHE_H */
--- a/arch/microblaze/include/asm/page.h~microblaze-move-the-arch_dmaslab_minalign-definitions-to-asm-cacheh
+++ a/arch/microblaze/include/asm/page.h
@@ -30,11 +30,6 @@
#ifndef __ASSEMBLY__
-/* MS be sure that SLAB allocates aligned objects */
-#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
-
-#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
-
/*
* PAGE_OFFSET -- the first address of the first page of memory. With MMU
* it is set to the kernel start address (aligned on a page boundary).
_
Patches currently in -mm which might be from catalin.marinas@xxxxxxx are
