Merge tag 'arm-soc/for-5.2/drivers-fixes' of https://github.com/Broadcom/stblinux...

[thirdparty/linux.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index d210cc9d6f800711a08523d364ecfa42431cdf39..ac5e5ba78874661445a3cd8854f7c15844904914 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -33,7 +33,7 @@ mmu-$(CONFIG_MMU)     += process_vm_access.o
 endif
 
 obj-y                  := filemap.o mempool.o oom_kill.o fadvise.o \
-                          maccess.o page_alloc.o page-writeback.o \
+                          maccess.o page-writeback.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 \
@@ -41,6 +41,11 @@ obj-y                        := filemap.o mempool.o oom_kill.o fadvise.o \
                           interval_tree.o list_lru.o workingset.o \
                           debug.o $(mmu-y)
 
+# Give 'page_alloc' its own module-parameter namespace
+page-alloc-y := page_alloc.o
+page-alloc-$(CONFIG_SHUFFLE_PAGE_ALLOCATOR) += shuffle.o
+
+obj-y += page-alloc.o
 obj-y += init-mm.o
 obj-y += memblock.o