Automatic merge with /usr/src/ntfs-2.6.git.

[~andy/linux] / mm / madvise.c

diff --git a/mm/madvise.c b/mm/madvise.c
index 54a5d3bc55d501caa3d2da3f3a9ef265ca584f2a..73180a22877ed24bcbd01fbca9a2be10c799df2f 100644 (file)
--- 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)