diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
| commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
| tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /arch/x86/Kconfig | |
| parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
| parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0fdc120de8d3..e7fd3bda2055 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -83,6 +83,7 @@ config X86 select HAVE_CMPXCHG_LOCAL select HAVE_CMPXCHG_DOUBLE select HAVE_ARCH_KMEMCHECK + select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP select HAVE_USER_RETURN_NOTIFIER select ARCH_BINFMT_ELF_RANDOMIZE_PIE select HAVE_ARCH_JUMP_LABEL |