aboutsummaryrefslogtreecommitdiffstats
path: root/mm/madvise.c
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2005-06-23 22:05:29 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 00:06:42 -0700
commitfe77ba6f4f97690baa4c756611a07f3cc033f6ae (patch)
tree01abe2ed3f1ed6f9340f7d9cbad461cbedb47e65 /mm/madvise.c
parenteb6fe0c388e43b02e261f0fdee60e42f6298d7f7 (diff)
downloadkernel_samsung_smdk4412-fe77ba6f4f97690baa4c756611a07f3cc033f6ae.zip
kernel_samsung_smdk4412-fe77ba6f4f97690baa4c756611a07f3cc033f6ae.tar.gz
kernel_samsung_smdk4412-fe77ba6f4f97690baa4c756611a07f3cc033f6ae.tar.bz2
[PATCH] xip: madvice/fadvice: execute in place
Make sys_madvice/fadvice return sane with xip. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/madvise.c')
-rw-r--r--mm/madvise.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/madvise.c b/mm/madvise.c
index 54a5d3b..73180a2 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -86,6 +86,11 @@ static long madvise_willneed(struct vm_area_struct * vma,
if (!file)
return -EBADF;
+ if (file->f_mapping->a_ops->get_xip_page) {
+ /* no bad return value, but ignore advice */
+ return 0;
+ }
+
*prev = vma;
start = ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
if (end > vma->vm_end)