diff options
author | Graeme Gregory <graeme.gregory@linaro.org> | 2016-05-17 12:41:13 +0100 |
---|---|---|
committer | Graeme Gregory <graeme.gregory@linaro.org> | 2016-05-17 12:41:13 +0100 |
commit | aa4f2e35a233a1bf805e0a09e080f62901b86e90 (patch) | |
tree | 87ae5361926e68957a6cfb2d386f9c8c19920676 /arch/arm64/mm/Makefile | |
parent | e524f676b12e8288d74add07db3957184c0f45de (diff) | |
parent | 7e915347e666b7fe00d51a188152891956007b18 (diff) |
Merge branch 'topic-numa' into leg-kernel
Diffstat (limited to 'arch/arm64/mm/Makefile')
-rw-r--r-- | arch/arm64/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile index 57f57fde5722..54bb209cae8e 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -4,6 +4,7 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ context.o proc.o pageattr.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_ARM64_PTDUMP) += dump.o +obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_KASAN) += kasan_init.o KASAN_SANITIZE_kasan_init.o := n |