Merge branch 'linus' into tracing/kmemtrace

[firefly-linux-kernel-4.4.55.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index c06b45a1ff5f64cf2e007258bfdaf9af5c280d98..c92e8af132062fca5444e4d497a9989a05c31254 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -28,9 +28,11 @@ obj-$(CONFIG_SLOB) += slob.o
 obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
 obj-$(CONFIG_SLAB) += slab.o
 obj-$(CONFIG_SLUB) += slub.o
+obj-$(CONFIG_FAILSLAB) += failslab.o
 obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
 obj-$(CONFIG_FS_XIP) += filemap_xip.o
 obj-$(CONFIG_MIGRATION) += migrate.o
 obj-$(CONFIG_SMP) += allocpercpu.o
 obj-$(CONFIG_QUICKLIST) += quicklist.o
 obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
+obj-$(CONFIG_KMEMTRACE) += kmemtrace.o