diff for duplicates of <4F9A3364.4090009@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 234c546..0dc1346 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,67 +1 @@ Maybe Aneesh will post his own version. This is just for my work. - -From eaf25c555ec809006220ef22ef152aa04c30c1af Mon Sep 17 00:00:00 2001 -From: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> -Date: Thu, 26 Apr 2012 17:51:52 +0900 -Subject: [PATCH 1/9] compile-fix - -My version of compile fix for linux-next, discussed between Andrew and -Aneesh. - -Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> ---- - include/linux/hugetlb.h | 4 ---- - include/linux/memcontrol.h | 15 +++++++++++++++ - 2 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h -index 828b073..fc226be 100644 ---- a/include/linux/hugetlb.h -+++ b/include/linux/hugetlb.h -@@ -343,8 +343,4 @@ static inline unsigned int pages_per_huge_page(struct hstate *h) - #define hstate_index(h) 0 - #endif - --#ifdef CONFIG_MEM_RES_CTLR_HUGETLB --extern int hugetlb_force_memcg_empty(struct cgroup *cgroup); --#endif -- - #endif /* _LINUX_HUGETLB_H */ -diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h -index f173811..ca0914a 100644 ---- a/include/linux/memcontrol.h -+++ b/include/linux/memcontrol.h -@@ -450,9 +450,14 @@ extern int mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup, - struct page *page); - extern bool mem_cgroup_have_hugetlb_usage(struct cgroup *cgroup); - -+extern int hugetlb_force_memcg_empty(struct cgroup *cgroup); -+ - extern void mem_cgroup_hugetlb_migrate(struct page *oldhpage, - struct page *newhpage); - #else -+struct cgroup; -+struct mem_cgroup; -+ - static inline int - mem_cgroup_hugetlb_charge_page(int idx, unsigned long nr_pages, - struct mem_cgroup **ptr) -@@ -494,6 +499,16 @@ mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup, - return 0; - } - -+static inline void mem_cgroup_hugetlb_migrate(struct page *oldhpage, -+ struct page *newhpage) -+{ -+ return; -+} -+ -+static inline int hugetlb_force_memcg_empty(struct cgroup *cgroup) -+{ -+ return 0; -+} - #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ - #endif /* _LINUX_MEMCONTROL_H */ - --- -1.7.4.1 diff --git a/a/content_digest b/N1/content_digest index 0f657bc..5d978bd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,88 +1,21 @@ "ref\04F9A327A.6050409@jp.fujitsu.com\0" - "ref\04F9A327A.6050409-+CUm20s59erQFUHtdCDX3A@public.gmane.org\0" - "From\0KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\0" + "From\0KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\0" "Subject\0[RFC][PATCH 1/7 v2] temporal compile-fix in linux-next\0" "Date\0Fri, 27 Apr 2012 14:49:24 +0900\0" - "To\0Linux Kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" - "Cc\0linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org <linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org>" - cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org> - Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> - Frederic Weisbecker <fweisbec-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Glauber Costa <glommer-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org> - Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Han Ying <yinghan-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> - Aneesh Kumar K.V <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> - Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> - " kamezawa.hiroyuki-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "To\0Linux Kernel <linux-kernel@vger.kernel.org>\0" + "Cc\0linux-mm@kvack.org <linux-mm@kvack.org>" + cgroups@vger.kernel.org <cgroups@vger.kernel.org> + Michal Hocko <mhocko@suse.cz> + Johannes Weiner <hannes@cmpxchg.org> + Frederic Weisbecker <fweisbec@gmail.com> + Glauber Costa <glommer@parallels.com> + Tejun Heo <tj@kernel.org> + Han Ying <yinghan@google.com> + Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> + Andrew Morton <akpm@linux-foundation.org> + " kamezawa.hiroyuki@gmail.com\0" "\00:1\0" "b\0" - "Maybe Aneesh will post his own version. This is just for my work.\n" - "\n" - "From eaf25c555ec809006220ef22ef152aa04c30c1af Mon Sep 17 00:00:00 2001\n" - "From: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\n" - "Date: Thu, 26 Apr 2012 17:51:52 +0900\n" - "Subject: [PATCH 1/9] compile-fix\n" - "\n" - "My version of compile fix for linux-next, discussed between Andrew and\n" - "Aneesh.\n" - "\n" - "Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\n" - "---\n" - " include/linux/hugetlb.h | 4 ----\n" - " include/linux/memcontrol.h | 15 +++++++++++++++\n" - " 2 files changed, 15 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h\n" - "index 828b073..fc226be 100644\n" - "--- a/include/linux/hugetlb.h\n" - "+++ b/include/linux/hugetlb.h\n" - "@@ -343,8 +343,4 @@ static inline unsigned int pages_per_huge_page(struct hstate *h)\n" - " #define hstate_index(h) 0\n" - " #endif\n" - " \n" - "-#ifdef CONFIG_MEM_RES_CTLR_HUGETLB\n" - "-extern int hugetlb_force_memcg_empty(struct cgroup *cgroup);\n" - "-#endif\n" - "-\n" - " #endif /* _LINUX_HUGETLB_H */\n" - "diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h\n" - "index f173811..ca0914a 100644\n" - "--- a/include/linux/memcontrol.h\n" - "+++ b/include/linux/memcontrol.h\n" - "@@ -450,9 +450,14 @@ extern int mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup,\n" - " \t\t\t\t\t struct page *page);\n" - " extern bool mem_cgroup_have_hugetlb_usage(struct cgroup *cgroup);\n" - " \n" - "+extern int hugetlb_force_memcg_empty(struct cgroup *cgroup);\n" - "+\n" - " extern void mem_cgroup_hugetlb_migrate(struct page *oldhpage,\n" - " \t\t\t\t\tstruct page *newhpage);\n" - " #else\n" - "+struct cgroup;\n" - "+struct mem_cgroup;\n" - "+\n" - " static inline int\n" - " mem_cgroup_hugetlb_charge_page(int idx, unsigned long nr_pages,\n" - " \t\t\t\t\t\t struct mem_cgroup **ptr)\n" - "@@ -494,6 +499,16 @@ mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup,\n" - " \treturn 0;\n" - " }\n" - " \n" - "+static inline void mem_cgroup_hugetlb_migrate(struct page *oldhpage,\n" - "+\t\t\t\tstruct page *newhpage)\n" - "+{\n" - "+\treturn;\n" - "+}\n" - "+\n" - "+static inline int hugetlb_force_memcg_empty(struct cgroup *cgroup)\n" - "+{\n" - "+\treturn 0;\n" - "+}\n" - " #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */\n" - " #endif /* _LINUX_MEMCONTROL_H */\n" - " \n" - "-- \n" - 1.7.4.1 + Maybe Aneesh will post his own version. This is just for my work. -3fc85830baed3e717d665a31c5bb390e42f31981edf242dd32c16cc789bebb60 +4cad1a0f2e7a60bf89f0c41d443626fa9a581a0bef7af7736b7b9ce4c461384c
diff --git a/a/1.txt b/N2/1.txt index 234c546..8b8c959 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,14 +1,14 @@ Maybe Aneesh will post his own version. This is just for my work. -From eaf25c555ec809006220ef22ef152aa04c30c1af Mon Sep 17 00:00:00 2001 -From: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> +>From eaf25c555ec809006220ef22ef152aa04c30c1af Mon Sep 17 00:00:00 2001 +From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Date: Thu, 26 Apr 2012 17:51:52 +0900 Subject: [PATCH 1/9] compile-fix My version of compile fix for linux-next, discussed between Andrew and Aneesh. -Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> +Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> --- include/linux/hugetlb.h | 4 ---- include/linux/memcontrol.h | 15 +++++++++++++++ diff --git a/a/content_digest b/N2/content_digest index 0f657bc..846b073 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,33 +1,32 @@ "ref\04F9A327A.6050409@jp.fujitsu.com\0" - "ref\04F9A327A.6050409-+CUm20s59erQFUHtdCDX3A@public.gmane.org\0" - "From\0KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\0" + "From\0KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\0" "Subject\0[RFC][PATCH 1/7 v2] temporal compile-fix in linux-next\0" "Date\0Fri, 27 Apr 2012 14:49:24 +0900\0" - "To\0Linux Kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" - "Cc\0linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org <linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org>" - cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org> - Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> - Frederic Weisbecker <fweisbec-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Glauber Costa <glommer-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org> - Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Han Ying <yinghan-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> - Aneesh Kumar K.V <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> - Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> - " kamezawa.hiroyuki-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "To\0Linux Kernel <linux-kernel@vger.kernel.org>\0" + "Cc\0linux-mm@kvack.org <linux-mm@kvack.org>" + cgroups@vger.kernel.org <cgroups@vger.kernel.org> + Michal Hocko <mhocko@suse.cz> + Johannes Weiner <hannes@cmpxchg.org> + Frederic Weisbecker <fweisbec@gmail.com> + Glauber Costa <glommer@parallels.com> + Tejun Heo <tj@kernel.org> + Han Ying <yinghan@google.com> + Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> + Andrew Morton <akpm@linux-foundation.org> + " kamezawa.hiroyuki@gmail.com\0" "\00:1\0" "b\0" "Maybe Aneesh will post his own version. This is just for my work.\n" "\n" - "From eaf25c555ec809006220ef22ef152aa04c30c1af Mon Sep 17 00:00:00 2001\n" - "From: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\n" + ">From eaf25c555ec809006220ef22ef152aa04c30c1af Mon Sep 17 00:00:00 2001\n" + "From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\n" "Date: Thu, 26 Apr 2012 17:51:52 +0900\n" "Subject: [PATCH 1/9] compile-fix\n" "\n" "My version of compile fix for linux-next, discussed between Andrew and\n" "Aneesh.\n" "\n" - "Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>\n" + "Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\n" "---\n" " include/linux/hugetlb.h | 4 ----\n" " include/linux/memcontrol.h | 15 +++++++++++++++\n" @@ -85,4 +84,4 @@ "-- \n" 1.7.4.1 -3fc85830baed3e717d665a31c5bb390e42f31981edf242dd32c16cc789bebb60 +105e7234ff9d4b7b6953aab64688f3985a7fd8489f7eed1cd2df3942aecd38b4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.