diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-14 05:42:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 05:42:56 -0700 |
| commit | 485ba3c3b6da6ca02daee0f961fe70beaebd32b3 (patch) | |
| tree | 86972e45681ee206f837cc2e36e8b37a3f69b1f7 /include/linux | |
| parent | c78a6f265684bbe76a03d45666b8b6dee4952045 (diff) | |
[PATCH] rmap-5-swap_unplug-page-revert
Revert the pre-2.6.6 per-address-space unplugging changes. This removes a
swapper_space exceptionality, syncs things with Andrea and provides for
simplification of the swap unplug function.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/swap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 5c5a79729041..f911d8afb8a5 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -181,6 +181,8 @@ 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 *); + #ifdef CONFIG_SWAP /* linux/mm/page_io.c */ extern int swap_readpage(struct file *, struct page *); @@ -216,7 +218,7 @@ extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t); extern struct swap_info_struct *get_swap_info_struct(unsigned); extern int can_share_swap_page(struct page *); extern int remove_exclusive_swap_page(struct page *); -extern void swap_unplug_io_fn(struct page *); +struct backing_dev_info; extern struct swap_list_t swap_list; extern spinlock_t swaplock; @@ -250,7 +252,6 @@ extern spinlock_t swaplock; #define move_from_swap_cache(p, i, m) 1 #define __delete_from_swap_cache(p) /*NOTHING*/ #define delete_from_swap_cache(p) /*NOTHING*/ -#define swap_unplug_io_fn(p) /*NOTHING*/ static inline int remove_exclusive_swap_page(struct page *p) { |