diff options
| author |   Andrey Konovalov <andreyknvl@google.com> | 2019-01-11 14:47:40 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2019-01-16 12:09:11 +0000 |
| commit | 7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9 (patch) | |
| tree | 43e6096d4ddfec078ba271d727ac36481dd476af /arch | |
| parent | arm64: kaslr: ensure randomized quantities are clean to the PoC (diff) | |
| download | linux-dev-7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9.tar.xz linux-dev-7fa1e2e6afa7f4c9f46528e61de6a15d9e8dffd9.zip | |
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 <andreyknvl@google.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/cache.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index eb43e09c1980..926434f413fa 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__ |