diff --git a/[refs] b/[refs] index 9fb733216101..ffc82ad75361 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d7d3eb2bad116e0d1b3b3930a923c55f6d0f70e +refs/heads/master: 22d5368a0838c00ed0e3ec20e7ff8c6e46ba99ef diff --git a/trunk/mm/thrash.c b/trunk/mm/thrash.c index e53f7d02c17c..57ad495dbd54 100644 --- a/trunk/mm/thrash.c +++ b/trunk/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)