Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel...

Pull tinification fix from Josh "Paper Bag" Triplett:
 "Fixup to use PATCHv2 of 'mm: Support compiling out madvise and
  fadvise'"

* tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux:
  mm: Support fadvise without CONFIG_MMU

diff --combined mm/Makefile
index 1f534a7f0a711396bab99d6399f2bc40898ae850,2ad574d1d12d0ad9164b3b37c055c66a689427b7..8405eb0023a918a30cc6109f404f8c1633beb9c4
--- 1/mm/Makefile
--- 2/mm/Makefile
+++ b/mm/Makefile
@@@ -16,9 -16,9 +16,9 @@@ obj-y                 := filemap.o mempool.o oom_kill
                           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 vmacache.o \
 +                         compaction.o vmacache.o \
                           interval_tree.o list_lru.o workingset.o \
 -                         iov_iter.o $(mmu-y)
 +                         iov_iter.o debug.o $(mmu-y)
  
  obj-y += init-mm.o
  
@@@ -28,8 -28,9 +28,9 @@@ els
        obj-y           += bootmem.o
  endif
  
+ obj-$(CONFIG_ADVISE_SYSCALLS) += fadvise.o
  ifdef CONFIG_MMU
-       obj-$(CONFIG_ADVISE_SYSCALLS)   += fadvise.o madvise.o
+       obj-$(CONFIG_ADVISE_SYSCALLS)   += madvise.o
  endif
  obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
  
@@@ -67,4 -68,3 +68,4 @@@ obj-$(CONFIG_ZBUD)    += zbud.
  obj-$(CONFIG_ZSMALLOC)        += zsmalloc.o
  obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o
  obj-$(CONFIG_CMA)     += cma.o
 +obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o