aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2012-05-29 18:06:55 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 19:22:25 -0400
commit6bbda35ce1e854eae147d1365ac827eb6e229063 (patch)
treee222ac89aaef14e96f2a06f3f54beea6161f79fb /mm
parentbbf808ed7de68fdf626fd4f9718d88cf03ce13a9 (diff)
memcg: mark more functions/variables as static
Based on sparse output. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 75f23e98db43..9692c5215a2c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -59,7 +59,7 @@
59 59
60struct cgroup_subsys mem_cgroup_subsys __read_mostly; 60struct cgroup_subsys mem_cgroup_subsys __read_mostly;
61#define MEM_CGROUP_RECLAIM_RETRIES 5 61#define MEM_CGROUP_RECLAIM_RETRIES 5
62struct mem_cgroup *root_mem_cgroup __read_mostly; 62static struct mem_cgroup *root_mem_cgroup __read_mostly;
63 63
64#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP 64#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
65/* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */ 65/* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */
@@ -1628,7 +1628,7 @@ int mem_cgroup_select_victim_node(struct mem_cgroup *memcg)
1628 * unused nodes. But scan_nodes is lazily updated and may not cotain 1628 * unused nodes. But scan_nodes is lazily updated and may not cotain
1629 * enough new information. We need to do double check. 1629 * enough new information. We need to do double check.
1630 */ 1630 */
1631bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap) 1631static bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
1632{ 1632{
1633 int nid; 1633 int nid;
1634 1634
@@ -1663,7 +1663,7 @@ int mem_cgroup_select_victim_node(struct mem_cgroup *memcg)
1663 return 0; 1663 return 0;
1664} 1664}
1665 1665
1666bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap) 1666static bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
1667{ 1667{
1668 return test_mem_cgroup_node_reclaimable(memcg, 0, noswap); 1668 return test_mem_cgroup_node_reclaimable(memcg, 0, noswap);
1669} 1669}
@@ -1837,7 +1837,8 @@ static void memcg_oom_recover(struct mem_cgroup *memcg)
1837/* 1837/*
1838 * try to call OOM killer. returns false if we should exit memory-reclaim loop. 1838 * try to call OOM killer. returns false if we should exit memory-reclaim loop.
1839 */ 1839 */
1840bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask, int order) 1840static bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask,
1841 int order)
1841{ 1842{
1842 struct oom_wait_info owait; 1843 struct oom_wait_info owait;
1843 bool locked, need_to_kill; 1844 bool locked, need_to_kill;
@@ -3767,7 +3768,7 @@ try_to_free:
3767 goto move_account; 3768 goto move_account;
3768} 3769}
3769 3770
3770int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event) 3771static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
3771{ 3772{
3772 return mem_cgroup_force_empty(mem_cgroup_from_cont(cont), true); 3773 return mem_cgroup_force_empty(mem_cgroup_from_cont(cont), true);
3773} 3774}
@@ -4048,7 +4049,7 @@ struct mcs_total_stat {
4048 s64 stat[NR_MCS_STAT]; 4049 s64 stat[NR_MCS_STAT];
4049}; 4050};
4050 4051
4051struct { 4052static struct {
4052 char *local_name; 4053 char *local_name;
4053 char *total_name; 4054 char *total_name;
4054} memcg_stat_strings[NR_MCS_STAT] = { 4055} memcg_stat_strings[NR_MCS_STAT] = {