2 files changed, 9 insertions, 0 deletions

diff --git a/mm/fadvise.c b/mm/fadvise.c
index 57264d74b8bf..5f19e87bc5af 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -43,6 +43,10 @@ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
                 goto out;
         }
 
+        if (mapping->a_ops->get_xip_page)
+                /* no bad return value, but ignore advice */
+                goto out;
+
         /* Careful about overflows. Len == 0 means "as much as possible" */
         endbyte = offset + len;
         if (!len || endbyte < len)
diff --git a/mm/madvise.c b/mm/madvise.c
index 54a5d3bc55d5..73180a22877e 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)