|
@@ -59,7 +59,7 @@
|
|
|
|
|
|
struct cgroup_subsys mem_cgroup_subsys __read_mostly;
|
|
|
#define MEM_CGROUP_RECLAIM_RETRIES 5
|
|
|
-struct mem_cgroup *root_mem_cgroup __read_mostly;
|
|
|
+static struct mem_cgroup *root_mem_cgroup __read_mostly;
|
|
|
|
|
|
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
|
|
|
/* 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)
|
|
|
* unused nodes. But scan_nodes is lazily updated and may not cotain
|
|
|
* enough new information. We need to do double check.
|
|
|
*/
|
|
|
-bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
|
|
|
+static bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
|
|
|
{
|
|
|
int nid;
|
|
|
|
|
@@ -1663,7 +1663,7 @@ int mem_cgroup_select_victim_node(struct mem_cgroup *memcg)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
|
|
|
+static bool mem_cgroup_reclaimable(struct mem_cgroup *memcg, bool noswap)
|
|
|
{
|
|
|
return test_mem_cgroup_node_reclaimable(memcg, 0, noswap);
|
|
|
}
|
|
@@ -1837,7 +1837,8 @@ static void memcg_oom_recover(struct mem_cgroup *memcg)
|
|
|
/*
|
|
|
* try to call OOM killer. returns false if we should exit memory-reclaim loop.
|
|
|
*/
|
|
|
-bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
|
|
|
+static bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask,
|
|
|
+ int order)
|
|
|
{
|
|
|
struct oom_wait_info owait;
|
|
|
bool locked, need_to_kill;
|
|
@@ -3767,7 +3768,7 @@ try_to_free:
|
|
|
goto move_account;
|
|
|
}
|
|
|
|
|
|
-int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
|
|
|
+static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
|
|
|
{
|
|
|
return mem_cgroup_force_empty(mem_cgroup_from_cont(cont), true);
|
|
|
}
|
|
@@ -4048,7 +4049,7 @@ struct mcs_total_stat {
|
|
|
s64 stat[NR_MCS_STAT];
|
|
|
};
|
|
|
|
|
|
-struct {
|
|
|
+static struct {
|
|
|
char *local_name;
|
|
|
char *total_name;
|
|
|
} memcg_stat_strings[NR_MCS_STAT] = {
|