diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-10-10 16:12:28 -0400 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2014-10-10 16:12:28 -0400 |
| commit | 887e7019e3b8f00c7901c0bc66fb689ced69f7b4 (patch) | |
| tree | 1fc6fbc9067c1453123b96ffdf7918c7e8be6af0 /mm | |
| parent | d3ac21cacc24790eb45d735769f35753f5b56ceb (diff) | |
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/Makefile | 3 |
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 | |||
| 28 | obj-y += bootmem.o | 28 | obj-y += bootmem.o |
| 29 | endif | 29 | endif |
| 30 | 30 | ||
| 31 | obj-$(CONFIG_ADVISE_SYSCALLS) += fadvise.o | ||
| 31 | ifdef CONFIG_MMU | 32 | ifdef CONFIG_MMU |
| 32 | obj-$(CONFIG_ADVISE_SYSCALLS) += fadvise.o madvise.o | 33 | obj-$(CONFIG_ADVISE_SYSCALLS) += madvise.o |
| 33 | endif | 34 | endif |
| 34 | obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o | 35 | obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o |
| 35 | 36 | ||