diff --git a/[refs] b/[refs]
index 9ac56b7eae12..a973b6cc8cdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 417b43d4b728619e9bcc2da4fa246a6350d46667
+refs/heads/master: 58984ce21d315b70df1a43644df7416ea7c9bfd8
diff --git a/trunk/mm/filemap_xip.c b/trunk/mm/filemap_xip.c
index 0c04615651b7..427dfe3ce78c 100644
--- a/trunk/mm/filemap_xip.c
+++ b/trunk/mm/filemap_xip.c
@@ -89,8 +89,8 @@ do_xip_mapping_read(struct address_space *mapping,
 			}
 		}
 		nr = nr - offset;
-		if (nr > len)
-			nr = len;
+		if (nr > len - copied)
+			nr = len - copied;
 
 		error = mapping->a_ops->get_xip_mem(mapping, index, 0,
 							&xip_mem, &xip_pfn);