---

yaml --- r: 258934 b: refs/heads/master c: 53bb01f h: refs/heads/master v: v3
git-mirror · Jul 26, 2011 · e8f69c1 · e8f69c1
1 parent 4bc87a3
commit e8f69c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e21c7ffd6f7493aa01bccd17ebc13dbdfecce880
+refs/heads/master: 53bb01f593d50188c8d638f89db96f9b6b042bcd
diff --git a/trunk/mm/thrash.c b/trunk/mm/thrash.c
@@ -30,8 +30,6 @@
 static DEFINE_SPINLOCK(swap_token_lock);
 struct mm_struct *swap_token_mm;
 struct mem_cgroup *swap_token_memcg;
-static unsigned int global_faults;
-static unsigned int last_aging;
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 static struct mem_cgroup *swap_token_memcg_from_mm(struct mm_struct *mm)
@@ -55,6 +53,8 @@ void grab_swap_token(struct mm_struct *mm)
 {
 	int current_interval;
 	unsigned int old_prio = mm->token_priority;
+	static unsigned int global_faults;
+	static unsigned int last_aging;
 
 	global_faults++;