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/mm/Makefile | |
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/mm/Makefile')
-rw-r--r-- | arch/x86/mm/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 6a19ad9f370d..9648838b78fa 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -20,6 +20,9 @@ obj-$(CONFIG_HIGHMEM) += highmem_32.o obj-$(CONFIG_KMEMCHECK) += kmemcheck/ +KASAN_SANITIZE_kasan_init_$(BITS).o := n +obj-$(CONFIG_KASAN) += kasan_init_$(BITS).o + obj-$(CONFIG_MMIOTRACE) += mmiotrace.o mmiotrace-y := kmmio.o pf_in.o mmio-mod.o obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o |