Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[linux-2.6-block.git] / mm / thrash.c

diff --git a/mm/thrash.c b/mm/thrash.c
index e53f7d02c17cd682c27f0bef1275c416586a9c26..57ad495dbd54392ff5d1d23125f38f605e4d2763 100644 (file)
--- a/mm/thrash.c
+++ b/mm/thrash.c
@@ -29,7 +29,7 @@
 
 static DEFINE_SPINLOCK(swap_token_lock);
 struct mm_struct *swap_token_mm;
-struct mem_cgroup *swap_token_memcg;
+static struct mem_cgroup *swap_token_memcg;
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 static struct mem_cgroup *swap_token_memcg_from_mm(struct mm_struct *mm)