Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce254b34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 47e0de1a 887e7019

mm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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