X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Ffadvise.c;h=5f19e87bc5af1c86dd121d7e50dcd3e5cc1c7e94;hb=53e9a6159fdc6419874ce4d86d3577dbedc77b62;hp=57264d74b8bff0528dd09456c4c81d6c6785363c;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6

diff --git a/mm/fadvise.c b/mm/fadvise.c
index 57264d74b8..5f19e87bc5 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)