From 54b475eac95bb61dbe9fbda5ab76e606cd64ea4a Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Fri, 8 Feb 2008 04:20:11 -0800
Subject: [PATCH] --- yaml --- r: 84712 b: refs/heads/master c:
 2004dc8eec1b4f0692b3be87ea80c70faa44d619 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/mm/filemap.c     | 2 +-
 trunk/mm/filemap_xip.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3baf97499990..3276d0d2d2ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 476aed3870b26735c4fcfdaa95420fa9e1de5119
+refs/heads/master: 2004dc8eec1b4f0692b3be87ea80c70faa44d619
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 5357fcc4643b..4eb958c402fe 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1332,7 +1332,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 	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 --git a/trunk/mm/filemap_xip.c b/trunk/mm/filemap_xip.c
index 0420a0292b03..5e598c42afd7 100644
--- a/trunk/mm/filemap_xip.c
+++ b/trunk/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);