From ae84633d22c000546fae0079d179b597cf83f85a Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Wed, 12 Dec 2012 13:51:57 -0800 Subject: [PATCH] --- yaml --- r: 343331 b: refs/heads/master c: 68ae564bbac8eb9ed54ddd2529b0e29ee190b355 h: refs/heads/master i: 343329: 650ee3c4b71bcf96e0184f87dadb86d90560e049 343327: a0149e8919be2f96a5b45eeee13f986eb0bde64a v: v3 --- [refs] | 2 +- trunk/include/linux/memcontrol.h | 9 ++++++++- trunk/mm/memcontrol.c | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a97435cc80d9..e4a947802d9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05b0afd73d04109d87f00ccd39f099e217c37263 +refs/heads/master: 68ae564bbac8eb9ed54ddd2529b0e29ee190b355 diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h index 11ddc7ffeba8..e98a74c0c9c0 100644 --- a/trunk/include/linux/memcontrol.h +++ b/trunk/include/linux/memcontrol.h @@ -181,7 +181,14 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, gfp_t gfp_mask, unsigned long *total_scanned); -void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx); +void __mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx); +static inline void mem_cgroup_count_vm_event(struct mm_struct *mm, + enum vm_event_item idx) +{ + if (mem_cgroup_disabled()) + return; + __mem_cgroup_count_vm_event(mm, idx); +} #ifdef CONFIG_TRANSPARENT_HUGEPAGE void mem_cgroup_split_huge_fixup(struct page *head); #endif diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 49d86d06e1dd..7f0e3571df7e 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -59,6 +59,8 @@ #include struct cgroup_subsys mem_cgroup_subsys __read_mostly; +EXPORT_SYMBOL(mem_cgroup_subsys); + #define MEM_CGROUP_RECLAIM_RETRIES 5 static struct mem_cgroup *root_mem_cgroup __read_mostly; @@ -1015,7 +1017,7 @@ void mem_cgroup_iter_break(struct mem_cgroup *root, iter != NULL; \ iter = mem_cgroup_iter(NULL, iter, NULL)) -void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx) +void __mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx) { struct mem_cgroup *memcg; @@ -1040,7 +1042,7 @@ void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx) out: rcu_read_unlock(); } -EXPORT_SYMBOL(mem_cgroup_count_vm_event); +EXPORT_SYMBOL(__mem_cgroup_count_vm_event); /** * mem_cgroup_zone_lruvec - get the lru list vector for a zone and memcg