From: Andrey Konovalov Date: Fri, 11 Jan 2019 13:47:40 +0000 (+0100) Subject: kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9;p=linux.git kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define 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 --- diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index eb43e09c1980f..926434f413fa2 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -60,8 +60,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__