Merge x86-64 update from Andi

[linux-2.6-block.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 23fad4dae23cd5973844573e0aaa0aa40ef4413d..1013a42d10b15c1e82d9a7cc5d30658e55284b19 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -926,13 +926,13 @@ int write_one_page(struct page *page, int wait);
                                         * turning readahead off */
 
 int do_page_cache_readahead(struct address_space *mapping, struct file *filp,
-                       unsigned long offset, unsigned long nr_to_read);
+                       pgoff_t offset, unsigned long nr_to_read);
 int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
-                       unsigned long offset, unsigned long nr_to_read);
-unsigned long  page_cache_readahead(struct address_space *mapping,
+                       pgoff_t offset, unsigned long nr_to_read);
+unsigned long page_cache_readahead(struct address_space *mapping,
                          struct file_ra_state *ra,
                          struct file *filp,
-                         unsigned long offset,
+                         pgoff_t offset,
                          unsigned long size);
 void handle_ra_miss(struct address_space *mapping, 
                    struct file_ra_state *ra, pgoff_t offset);