From: Jan Kara Convert variables containing page indexes to pgoff_t. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton --- mm/filemap.c | 2 +- mm/filemap_xip.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff -puN mm/filemap.c~use-pgoff_t-instead-of-unsigned-long mm/filemap.c --- a/mm/filemap.c~use-pgoff_t-instead-of-unsigned-long +++ a/mm/filemap.c @@ -1332,7 +1332,7 @@ int filemap_fault(struct vm_area_struct struct file_ra_state *ra = &file->f_ra; struct inode *inode = mapping->host; struct page *page; - unsigned long size; + pgoff_t size; int did_readaround = 0; int ret = 0; diff -puN mm/filemap_xip.c~use-pgoff_t-instead-of-unsigned-long mm/filemap_xip.c --- a/mm/filemap_xip.c~use-pgoff_t-instead-of-unsigned-long +++ a/mm/filemap_xip.c @@ -55,7 +55,8 @@ do_xip_mapping_read(struct address_space 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); _