merge opensource jb u5

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2

1 files changed, 25 insertions, 1 deletions

diff --git a/mm/Makefile b/mm/Makefile
index 4ade76a..9b994ce 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -14,7 +14,15 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
 			   mm_init.o mmu_context.o percpu.o \
 			   $(mmu-y)
 
-obj-y		+= page_alloc.o page_isolation.o
+ifdef CONFIG_SLP
+	obj-y		+= page_alloc-slp.o page_isolation-slp.o
+else
+ifdef CONFIG_DMA_CMA
+	obj-y		+= page_alloc-cma.o page_isolation-cma.o
+else
+	obj-y		+= page_alloc.o page_isolation.o
+endif
+endif
 
 obj-y += init-mm.o
 
@@ -35,7 +43,15 @@ obj-$(CONFIG_SPARSEMEM)	+= sparse.o
 obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o
 obj-$(CONFIG_ASHMEM) += ashmem.o
 obj-$(CONFIG_SLOB) += slob.o
+ifdef CONFIG_SLP
+obj-$(CONFIG_COMPACTION) += compaction-slp.o
+else
+ifdef CONFIG_DMA_CMA
+obj-$(CONFIG_COMPACTION) += compaction-cma.o
+else
 obj-$(CONFIG_COMPACTION) += compaction.o
+endif
+endif
 obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
 obj-$(CONFIG_KSM) += ksm.o
 obj-$(CONFIG_PAGE_POISONING) += debug-pagealloc.o
@@ -43,9 +59,17 @@ obj-$(CONFIG_SLAB) += slab.o
 obj-$(CONFIG_SLUB) += slub.o
 obj-$(CONFIG_KMEMCHECK) += kmemcheck.o
 obj-$(CONFIG_FAILSLAB) += failslab.o
+ifdef CONFIG_SLP
+obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug-slp.o
+else
 obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
+endif
 obj-$(CONFIG_FS_XIP) += filemap_xip.o
+ifdef CONFIG_DMA_CMA
+obj-$(CONFIG_MIGRATION) += migrate-cma.o
+else
 obj-$(CONFIG_MIGRATION) += migrate.o
+endif
 obj-$(CONFIG_QUICKLIST) += quicklist.o
 obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o
 obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o