Subject: [folded-merged] memcg-get_mem_cgroup_from_mm-fix.patch removed from -mm tree To: fengguang.wu@xxxxxxxxx,hannes@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 07 Apr 2014 15:09:32 -0700 The patch titled Subject: memcg-get_mem_cgroup_from_mm-fix has been removed from the -mm tree. Its filename was memcg-get_mem_cgroup_from_mm-fix.patch This patch was dropped because it was folded into memcg-get_mem_cgroup_from_mm.patch ------------------------------------------------------ From: Fengguang Wu <fengguang.wu@xxxxxxxxx> Subject: memcg-get_mem_cgroup_from_mm-fix Signed-off-by: Fengguang Wu <fengguang.wu@xxxxxxxxx> Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/memcontrol.h | 6 ------ mm/memcontrol.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff -puN include/linux/memcontrol.h~memcg-get_mem_cgroup_from_mm-fix include/linux/memcontrol.h --- a/include/linux/memcontrol.h~memcg-get_mem_cgroup_from_mm-fix +++ a/include/linux/memcontrol.h @@ -94,7 +94,6 @@ bool task_in_mem_cgroup(struct task_stru extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page); extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); -extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm); extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css); @@ -293,11 +292,6 @@ static inline struct mem_cgroup *try_get { return NULL; } - -static inline struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) -{ - return NULL; -} static inline bool mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *memcg) diff -puN mm/memcontrol.c~memcg-get_mem_cgroup_from_mm-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-get_mem_cgroup_from_mm-fix +++ a/mm/memcontrol.c @@ -1071,7 +1071,7 @@ struct mem_cgroup *mem_cgroup_from_task( return mem_cgroup_from_css(task_css(p, memory_cgrp_id)); } -struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) +static struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; _ Patches currently in -mm which might be from fengguang.wu@xxxxxxxxx are origin.patch tools-vm-page-typesc-page-cache-sniffing-feature.patch memcg-get_mem_cgroup_from_mm.patch zram-propagate-error-to-user-fix-2.patch slub-use-raw_cpu_inc-for-incrementing-statistics.patch slub-use-raw_cpu_inc-for-incrementing-statistics-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html