diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-11 13:54:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-11 13:54:52 -0800 |
| commit | 3fc928dc5308f6533d0e8004c8c63b46709a5276 (patch) | |
| tree | 97fe262892b85691899cda8d7a8aa8b67057d6d2 | |
| parent | Merge tag 'nios2-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 (diff) | |
| parent | xtensa: fix build with KASAN (diff) | |
| download | linux-dev-3fc928dc5308f6533d0e8004c8c63b46709a5276.tar.xz linux-dev-3fc928dc5308f6533d0e8004c8c63b46709a5276.zip | |
Merge tag 'xtensa-20180211' of git://github.com/jcmvbkbc/linux-xtensa
Pull xtense fix from Max Filippov:
"Build fix for xtensa architecture with KASAN enabled"
* tag 'xtensa-20180211' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: fix build with KASAN
| -rw-r--r-- | arch/xtensa/include/asm/kasan.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/kasan.h b/arch/xtensa/include/asm/kasan.h index 54be80876e57..216b6f32c375 100644 --- a/arch/xtensa/include/asm/kasan.h +++ b/arch/xtensa/include/asm/kasan.h @@ -10,6 +10,8 @@ #include <linux/sizes.h> #include <asm/kmem_layout.h> +#define KASAN_SHADOW_SCALE_SHIFT 3 + /* Start of area covered by KASAN */ #define KASAN_START_VADDR __XTENSA_UL_CONST(0x90000000) /* Start of the shadow map */ |