Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / mm / filemap_xip.c

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index e2b34e95913eac480e1067bc0288d96b457be282..b960ac8e5918dcb33e64b9b4f822f25540ddb4b4 100644 (file)
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -383,7 +383,7 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len,
        if (ret)
                goto out_backing;
 
-       inode_update_time(inode, 1);
+       file_update_time(filp);
 
        ret = __xip_file_write (filp, buf, count, pos, ppos);