Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2014 13:21:57 +0000 (09:21 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2014 13:21:57 +0000 (09:21 -0400)
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

mm/Makefile

index 1f534a7f0a711396bab99d6399f2bc40898ae850..8405eb0023a918a30cc6109f404f8c1633beb9c4 100644 (file)
@@ -28,8 +28,9 @@ else
        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