summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-10-10 13:12:28 -0700
committerJosh Triplett <josh@joshtriplett.org>2014-10-10 13:12:28 -0700
commit887e7019e3b8f00c7901c0bc66fb689ced69f7b4 (patch)
tree1fc6fbc9067c1453123b96ffdf7918c7e8be6af0 /mm
parentd3ac21cacc24790eb45d735769f35753f5b56ceb (diff)
downloadlinux-sh-887e7019e3b8f00c7901c0bc66fb689ced69f7b4.tar.gz
mm: Support fadvise without CONFIG_MMU
Commit d3ac21cacc24790eb45d735769f35753f5b56ceb ("mm: Support compiling out madvise and fadvise") incorrectly made fadvise conditional on CONFIG_MMU. (The merged branch unintentionally incorporated v1 of the patch rather than the fixed v2.) Apply the delta from v1 to v2, to allow fadvise without CONFIG_MMU. Reported-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Josh Triplett <josh@joshtriplett.org>
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 fe7a053c0f45..2ad574d1d12d 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