o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 6 insertions, 16 deletions

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 19e714c71..3b4d2c983 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -50,7 +50,7 @@ struct sysinfo;
 extern int shm_swap (int, int);
 
 /* linux/mm/vmscan.c */
-extern int try_to_free_page(int);
+extern int try_to_free_pages(unsigned int gfp_mask, int count);
 
 /* linux/mm/page_io.c */
 extern void rw_swap_page(int, unsigned long, char *, int);
@@ -75,6 +75,11 @@ extern struct swap_info_struct swap_info[];
 void si_swapinfo(struct sysinfo *);
 unsigned long get_swap_page(void);
 extern void FASTCALL(swap_free(unsigned long));
+struct swap_list_t {
+	int head;	/* head of priority-ordered swapfile list */
+	int next;	/* swapfile to be used next */
+};
+extern struct swap_list_t swap_list;
 
 /*
  * vm_ops not present page codes for shared memory.
@@ -124,21 +129,6 @@ static inline int is_page_shared(struct page *page)
 }
 
 /*
- * When we're freeing pages from a user application, we want
- * to cluster swapouts too.	-- Rik.
- * linux/mm/page_alloc.c
- */
-static inline int try_to_free_pages(int gfp_mask, int count)
-{
-	int retval = 0;
-	while (count--) {
-		if (try_to_free_page(gfp_mask))
-			retval = 1;
-	}
-	return retval;
-}
-
-/*
  * Make these inline later once they are working properly.
  */
 extern long find_in_swap_cache(struct page *page);