git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use pgoff_t instead of unsigned long
[safe/jmp/linux-2.6]
/
mm
/
filemap_xip.c
diff --git
a/mm/filemap_xip.c
b/mm/filemap_xip.c
index
f874ae8
..
5e598c4
100644
(file)
--- 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;
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);
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);
}
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);
return 0;
}
EXPORT_SYMBOL_GPL(xip_truncate_page);