5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit dadac97f066a67334268132c1e2d0fd599fbcbec which is commit 7ae04ba36b381bffe2471eff3a93edced843240f upstream. It is reported to cause build failures. Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/436a575b-4ec0-43a2-b4e9-7eb00d9bbbeb@xxxxxxxxxxxx Cc: Mikulas Patocka <mpatocka@xxxxxxxxxx> Cc: Helge Deller <deller@xxxxxx> Cc: Mingli Yu <mingli.yu@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/parisc/Kconfig | 1 - arch/parisc/include/asm/cache.h | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -15,7 +15,6 @@ config PARISC select ARCH_SPLIT_ARG64 if !64BIT select ARCH_SUPPORTS_HUGETLBFS if PA20 select ARCH_SUPPORTS_MEMORY_FAILURE - select ARCH_HAS_CACHE_LINE_SIZE select DMA_OPS select RTC_CLASS select RTC_DRV_GENERIC --- a/arch/parisc/include/asm/cache.h +++ b/arch/parisc/include/asm/cache.h @@ -20,16 +20,7 @@ #define SMP_CACHE_BYTES L1_CACHE_BYTES -#ifdef CONFIG_PA20 -#define ARCH_DMA_MINALIGN 128 -#else -#define ARCH_DMA_MINALIGN 32 -#endif -#define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */ - -#define arch_slab_minalign() ((unsigned)dcache_stride) -#define cache_line_size() dcache_stride -#define dma_get_cache_alignment cache_line_size +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES #define __read_mostly __section(".data..read_mostly")
