]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define
authorAndrey Konovalov <andreyknvl@google.com>
Fri, 11 Jan 2019 13:47:40 +0000 (14:47 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 16 Jan 2019 12:09:11 +0000 (12:09 +0000)
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 <andreyknvl@google.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/include/asm/cache.h

index eb43e09c1980f6f7e3ab4b4a1d99b411ee635733..926434f413fa2d965e3847d46e8c651505cfb30d 100644 (file)
@@ -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__