X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Ffilemap_xip.c;h=5e598c42afd726be44f9d862a086d52ed8adbd2a;hb=2004dc8eec1b4f0692b3be87ea80c70faa44d619;hp=f874ae818ad3812f7cd051972c823c743a154d33;hpb=c51b1a160b63304720d49479986915e4c475a2cf;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index f874ae8..5e598c4 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -56,7 +56,8 @@ do_xip_mapping_read(struct address_space *mapping,
 		    read_actor_t actor)
 {
 	struct inode *inode = mapping->host;
-	unsigned long index, end_index, offset;
+	pgoff_t index, end_index;
+	unsigned long offset;
 	loff_t isize;
 
 	BUG_ON(!mapping->a_ops->get_xip_page);
@@ -431,7 +432,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);