diff --git a/[refs] b/[refs]
index ed261dc48a68..09c8d9337a21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4670df831cb479ba57dd0fa0b8a9eb88cc7129be
+refs/heads/master: 369b8f5a70402d9fe77006cd0044c8a3fcd08430
diff --git a/trunk/mm/filemap_xip.c b/trunk/mm/filemap_xip.c
index 32132f3cd641..e233fff61b4b 100644
--- a/trunk/mm/filemap_xip.c
+++ b/trunk/mm/filemap_xip.c
@@ -314,7 +314,7 @@ __xip_file_write(struct file *filp, const char __user *buf,
 		fault_in_pages_readable(buf, bytes);
 		kaddr = kmap_atomic(page, KM_USER0);
 		copied = bytes -
-			__copy_from_user_inatomic_nocache(kaddr, buf, bytes);
+			__copy_from_user_inatomic_nocache(kaddr + offset, buf, bytes);
 		kunmap_atomic(kaddr, KM_USER0);
 		flush_dcache_page(page);