2.6.24-git15

 fs

diff --git a/fs/mpage.c b/fs/mpage.c
index d54f8f8..5df5643 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -276,9 +276,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
    }
 
    if (first_hole != blocks_per_page) {
-      zero_user_page(page, first_hole << blkbits,
-            PAGE_CACHE_SIZE - (first_hole << blkbits),
-            KM_USER0);
+      zero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE);
       if (first_hole == 0) {
          SetPageUptodate(page);
          unlock_page(page);
@@ -571,8 +569,7 @@ page_is_mapped:
 
       if (page->index > end_index || !offset)
          goto confused;
-      zero_user_page(page, offset, PAGE_CACHE_SIZE - offset,
-            KM_USER0);
+      zero_user_segment(page, offset, PAGE_CACHE_SIZE);
    }
 
    /*