diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 05:16:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 05:16:36 +0300 |
| commit | 4658000955d1864b54890214434e171949c7f1c5 (patch) | |
| tree | 9c2fffb52276dbbe7ce334e683a3262f699d3d10 /arch/x86/include | |
| parent | e10994ff38ded64e4cd2267a6e404a4c8632bcf5 (diff) | |
| parent | 69786cdb379bbc6eab14cf2393c1abd879316e85 (diff) | |
| download | linux-4658000955d1864b54890214434e171949c7f1c5.tar.xz | |
Merge branch 'mm-kasan-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/kasan changes from Ingo Molnar:
"These are two KASAN changes that factor out (and generalize) x86
specific KASAN code from x86 to mm"
* 'mm-kasan-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
x86/kasan: Define KASAN_SHADOW_OFFSET per architecture
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/kasan.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index 74a2a8dc9908..1410b567ecde 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -1,6 +1,9 @@ #ifndef _ASM_X86_KASAN_H #define _ASM_X86_KASAN_H +#include <linux/const.h> +#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) + /* * Compiler uses shadow offset assuming that addresses start * from 0. Kernel addresses don't start from 0, so shadow |