Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index 0c04615651b7..427dfe3ce78c 100644
--- a/mm/filemap_xip.c
+++ b/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);