Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756043Ab2FYLQK (ORCPT ); Mon, 25 Jun 2012 07:16:10 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:59343 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755878Ab2FYLQI (ORCPT ); Mon, 25 Jun 2012 07:16:08 -0400 From: Wanpeng Li To: Michal Hocko Cc: Johannes Weiner , KAMEZAWA Hiroyuki , Balbir Singh , Andrew Morton , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Wanpeng Li Subject: [PATCH v4 2/2] memcg: change mem_control_xxx to mem_cgroup_xxx Date: Mon, 25 Jun 2012 19:15:59 +0800 Message-Id: <1340622959-13136-1-git-send-email-liwp.linux@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1937 Lines: 60 From: Wanpeng Li Unify memcg functions to mem_cgroup_xxx. Signed-off-by: Wanpeng Li Acked-by: Johannes Weiner Acked-by: Michal Hocko Acked-by: KAMEZAWA Hiroyuki --- mm/memcontrol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ccda728..2e81328 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3999,7 +3999,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp, #endif #ifdef CONFIG_NUMA -static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft, +static int mem_cgroup_numa_stat_show(struct cgroup *cont, struct cftype *cft, struct seq_file *m) { int nid; @@ -4058,7 +4058,7 @@ static inline void mem_cgroup_lru_names_not_uptodate(void) BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS); } -static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, +static int mem_cgroup_stat_show(struct cgroup *cont, struct cftype *cft, struct seq_file *m) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); @@ -4572,7 +4572,7 @@ static struct cftype mem_cgroup_files[] = { }, { .name = "stat", - .read_seq_string = mem_control_stat_show, + .read_seq_string = mem_cgroup_stat_show, }, { .name = "force_empty", @@ -4604,7 +4604,7 @@ static struct cftype mem_cgroup_files[] = { #ifdef CONFIG_NUMA { .name = "numa_stat", - .read_seq_string = mem_control_numa_stat_show, + .read_seq_string = mem_cgroup_numa_stat_show, }, #endif #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/