From 4f65a1f31f9b6338e6e37f410203fe21521ce7bd Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Tue, 6 Jan 2009 14:39:44 -0800 Subject: [PATCH] --- yaml --- r: 126215 b: refs/heads/master c: d38d2a7582012ecf53aac33683ca5c689093cf65 h: refs/heads/master i: 126213: bb074c3127e940b70b16da39cc4b5185ec994f15 126211: c025b1fe77d8f46bbf3e65921ac7140b35dfb740 126207: 430159b812f23017c2421551f9fc33292d3467c3 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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;