From e8f69c1bb824e1ad48dc11bd74626865cd9f8c08 Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 25 Jul 2011 17:12:07 -0700 Subject: [PATCH] --- yaml --- r: 258934 b: refs/heads/master c: 53bb01f593d50188c8d638f89db96f9b6b042bcd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/thrash.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3e37d53303c7..0e07304dd58c 100644 --- 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 index d416d403e140..42ffb0179271 100644 --- 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++;