Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 866dcc7eeb0c3da1e4c6d822ece39a3ea65dc6f9..51ee965455798e63af02d392e44c09be8436d60d 100644 (file)
--- a/mm/memcontrol.c
+++ b/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;