Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index f874ae818ad3..0420a0292b03 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -431,7 +431,7 @@ xip_truncate_page(struct address_space *mapping, loff_t from)
                 else
                         return PTR_ERR(page);
         }
-        zero_user_page(page, offset, length, KM_USER0);
+        zero_user(page, offset, length);
         return 0;
 }
 EXPORT_SYMBOL_GPL(xip_truncate_page);