diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:07:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:07:54 +0200 |
| commit | a403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch) | |
| tree | 6526d8d3c46f2443c7836bf094366179a57e7aad /include/linux/swap.h | |
| parent | a05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff) | |
| parent | d974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff) | |
| download | talos-obmc-linux-a403e45c3b678211ee3b7225dbb924921fb5ddd3.tar.gz talos-obmc-linux-a403e45c3b678211ee3b7225dbb924921fb5ddd3.zip | |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 0b3377650c85..de40f169a4e4 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -237,7 +237,6 @@ extern struct page *swapin_readahead(swp_entry_t, gfp_t, /* linux/mm/swapfile.c */ extern long total_swap_pages; -extern unsigned int nr_swapfiles; extern void si_swapinfo(struct sysinfo *); extern swp_entry_t get_swap_page(void); extern swp_entry_t get_swap_page_of_type(int); @@ -254,8 +253,6 @@ extern int can_share_swap_page(struct page *); extern int remove_exclusive_swap_page(struct page *); struct backing_dev_info; -extern spinlock_t swap_lock; - /* linux/mm/thrash.c */ extern struct mm_struct * swap_token_mm; extern void grab_swap_token(void); |
