Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 310c90a092646004d9519a476386053d57d4c847..9e5aaf92197d3fcc7038e86d9769dc0def5bf1c3 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -16,8 +16,8 @@ obj-y                 := filemap.o mempool.o oom_kill.o fadvise.o \
                           readahead.o swap.o truncate.o vmscan.o shmem.o \
                           util.o mmzone.o vmstat.o backing-dev.o \
                           mm_init.o mmu_context.o percpu.o slab_common.o \
-                          compaction.o balloon_compaction.o \
-                          interval_tree.o list_lru.o $(mmu-y)
+                          compaction.o balloon_compaction.o vmacache.o \
+                          interval_tree.o list_lru.o workingset.o $(mmu-y)
 
 obj-y += init-mm.o
 
@@ -61,3 +61,4 @@ obj-$(CONFIG_CLEANCACHE) += cleancache.o
 obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o
 obj-$(CONFIG_ZBUD)     += zbud.o
 obj-$(CONFIG_ZSMALLOC) += zsmalloc.o
+obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o