diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
| commit | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (patch) | |
| tree | c845d5e80991f0eef3a38381036c8261baffb08a /arch/x86/boot/compressed/misc.h | |
| parent | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (diff) | |
| parent | 7b44c3df0b89d05c80e15eb0522a21d033d1314f (diff) | |
Merge branch 'v3.18/topic/KASAN' into linux-linaro-lsk-v3.18lsk-v3.18-16.04
Diffstat (limited to 'arch/x86/boot/compressed/misc.h')
| -rw-r--r-- | arch/x86/boot/compressed/misc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 24e3e569a13c..04477d68403f 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -7,6 +7,7 @@ * we just keep it from happening */ #undef CONFIG_PARAVIRT +#undef CONFIG_KASAN #ifdef CONFIG_X86_32 #define _ASM_X86_DESC_H 1 #endif |