---

 /dev/null                    |    0 
 25-akpm/include/linux/swap.h |    2 +-
 25-akpm/mm/swapfile.c        |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff -L mm/sapf -puN /dev/null /dev/null
diff -puN mm/swapfile.c~blk_run_page-swap-fixup mm/swapfile.c
--- 25/mm/swapfile.c~blk_run_page-swap-fixup	2004-05-12 18:27:35.738927664 -0700
+++ 25-akpm/mm/swapfile.c	2004-05-12 18:27:48.850934336 -0700
@@ -88,7 +88,7 @@ static void remove_swap_bdev(struct bloc
 	BUG();
 }
 
-void swap_unplug_io_fn(struct backing_dev_info *unused_bdi)
+void swap_unplug_io_fn(struct backing_dev_info *unused_bdi, struct page *page)
 {
 	int i;
 
diff -puN include/linux/swap.h~blk_run_page-swap-fixup include/linux/swap.h
--- 25/include/linux/swap.h~blk_run_page-swap-fixup	2004-05-12 18:50:00.499492984 -0700
+++ 25-akpm/include/linux/swap.h	2004-05-12 18:50:11.442829344 -0700
@@ -181,7 +181,7 @@ extern int vm_swappiness;
 extern int shmem_unuse(swp_entry_t entry, struct page *page);
 #endif /* CONFIG_MMU */
 
-extern void swap_unplug_io_fn(struct backing_dev_info *);
+extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
 
 #ifdef CONFIG_SWAP
 /* linux/mm/page_io.c */

_