diff --git a/[refs] b/[refs] index c9e103de2292..6acac927f84b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bc7273b0e3a509fb598abfc5b9fe50158b830d2 +refs/heads/master: d38d2a7582012ecf53aac33683ca5c689093cf65 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 866dcc7eeb0c..51ee96545579 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -779,7 +779,8 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask) return 0; } -int mem_cgroup_resize_limit(struct mem_cgroup *memcg, unsigned long long val) +static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, + unsigned long long val) { int retry_count = MEM_CGROUP_RECLAIM_RETRIES;