aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-12 09:21:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-12 09:21:57 -0400
commitce254b34da41b121c6d781fea8940090c0107a20 (patch)
tree4192d8921bef7513af7714cfe02f11ad6bf2cc76 /mm
parent47e0de1a74505537788dad41a55a7bdc224462b9 (diff)
parent887e7019e3b8f00c7901c0bc66fb689ced69f7b4 (diff)
Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux
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
Diffstat (limited to 'mm')
-rw-r--r--mm/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile
index 1f534a7f0a71..8405eb0023a9 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -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

Privacy Policy