From 5397d9be38cd1285246b315967225bc77721b666 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 25 Jul 2008 19:46:24 -0700
Subject: [PATCH] --- yaml --- r: 106255 b: refs/heads/master c:
 7c363b8c6536f26934172d3c46f0bbec01a97c61 h: refs/heads/master i:   106253:
 b041d86d8006fa57a20088dfca2db77d47631286   106251:
 0c59058f4c2036ead85abfe070890a38ddfdebda   106247:
 23e329e81220ff5e7f7bd59db4194ba494b67603   106239:
 a129d423e02069ef81f275394733ff4a3f88fbd8 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/swap.h | 3 ---
 trunk/mm/swapfile.c        | 6 +++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a7eca4c30717..c00e2e83f7e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15f59adae001766a2c7f7fe4f196387bb04bcff5
+refs/heads/master: 7c363b8c6536f26934172d3c46f0bbec01a97c61
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index 0b3377650c85..de40f169a4e4 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/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);
diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
index af283933c14e..6beb6251e99d 100644
--- a/trunk/mm/swapfile.c
+++ b/trunk/mm/swapfile.c
@@ -33,8 +33,8 @@
 #include <asm/tlbflush.h>
 #include <linux/swapops.h>
 
-DEFINE_SPINLOCK(swap_lock);
-unsigned int nr_swapfiles;
+static DEFINE_SPINLOCK(swap_lock);
+static unsigned int nr_swapfiles;
 long total_swap_pages;
 static int swap_overflow;
 static int least_priority;
@@ -44,7 +44,7 @@ static const char Unused_file[] = "Unused swap file entry ";
 static const char Bad_offset[] = "Bad swap offset entry ";
 static const char Unused_offset[] = "Unused swap offset entry ";
 
-struct swap_list_t swap_list = {-1, -1};
+static struct swap_list_t swap_list = {-1, -1};
 
 static struct swap_info_struct swap_info[MAX_SWAPFILES];