Merge tag 'trace-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

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

diff --git a/mm/swap.h b/mm/swap.h
index 8a3c7a0ace4f0c29180f5b39ee9d363b05a2b9f6..73c332ee4d910915e88cd46c12b8e59ba9540efc 100644 (file)
--- a/mm/swap.h
+++ b/mm/swap.h
@@ -2,6 +2,8 @@
 #ifndef _MM_SWAP_H
 #define _MM_SWAP_H
 
+struct mempolicy;
+
 #ifdef CONFIG_SWAP
 #include <linux/blk_types.h> /* for bio_end_io_t */
 
@@ -48,11 +50,10 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                                   unsigned long addr,
                                   struct swap_iocb **plug);
 struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
-                                    struct vm_area_struct *vma,
-                                    unsigned long addr,
+                                    struct mempolicy *mpol, pgoff_t ilx,
                                     bool *new_page_allocated);
 struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t flag,
-                                   struct vm_fault *vmf);
+                                   struct mempolicy *mpol, pgoff_t ilx);
 struct page *swapin_readahead(swp_entry_t entry, gfp_t flag,
                              struct vm_fault *vmf);
 
@@ -80,7 +81,7 @@ static inline void show_swap_cache_info(void)
 }
 
 static inline struct page *swap_cluster_readahead(swp_entry_t entry,
-                               gfp_t gfp_mask, struct vm_fault *vmf)
+                       gfp_t gfp_mask, struct mempolicy *mpol, pgoff_t ilx)
 {
        return NULL;
 }