From e545826cb25ea730cb7b3fc576aa46ad20c1a9c5 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 11 Jan 2019 14:47:40 +0100 Subject: [PATCH] UPSTREAM: kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define (Upstream commit 7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9). Defining ARCH_SLAB_MINALIGN in arch/arm64/include/asm/cache.h when KASAN is off is not needed, as it is defined in defined in include/linux/slab.h as ifndef. Signed-off-by: Andrey Konovalov Signed-off-by: Will Deacon Signed-off-by: Andrey Konovalov Bug: 128674696 Change-Id: I27d13c0ed9f8ab2488028b526561f90b3e2eec0c --- arch/arm64/include/asm/cache.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index 89f6bb5d6c30..88dab0d89125 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -51,8 +51,6 @@ #ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT) -#else -#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) #endif #ifndef __ASSEMBLY__