---

yaml --- r: 74611 b: refs/heads/master c: 369b8f5 h: refs/heads/master i: 74609: 591f485 74607: 0636f1e v: v3
git-mirror · Dec 5, 2007 · 254ed36 · 254ed36
1 parent c66e6e6
commit 254ed36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);