diff for duplicates of <4DE34AD0.1060905@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 184afc1..83724d5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,78 +9,3 @@ My bad. Following patch fixes this issue. Thanks. - - - ->From 6a824b46219cb2f11b125e9a33f65e0f01899d09 Mon Sep 17 00:00:00 2001 -From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> -Date: Mon, 30 May 2011 15:47:32 +0900 -Subject: [PATCH] swap-token: fix compilation error when CONFIG_CGROUPS=n - -Andrew Morton pointed out css_put() is not defined when -CONFIG_CGROUPS=n. - -: CONFIG_CGROUPS=n: -: -: mm/thrash.c: In function 'grab_swap_token': -: mm/thrash.c:73: error: implicit declaration of function 'css_put' - -Thus, this patch move the whole logic into CONFIG_CGROUP_MEM_RES_CTLR -condtion. - -Reported-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> ---- - mm/thrash.c | 24 +++++++++++++++++++----- - 1 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/mm/thrash.c b/mm/thrash.c -index 8832edb..cd06606 100644 ---- a/mm/thrash.c -+++ b/mm/thrash.c -@@ -31,11 +31,28 @@ static DEFINE_SPINLOCK(swap_token_lock); - struct mm_struct *swap_token_mm; - struct mem_cgroup *swap_token_memcg; - -+#ifdef CONFIG_CGROUP_MEM_RES_CTLR -+static struct mem_cgroup* swap_token_memcg_from_mm(struct mm_struct *mm) -+{ -+ struct mem_cgroup *memcg; -+ -+ memcg = try_get_mem_cgroup_from_mm(mm); -+ if (memcg) -+ css_put(mem_cgroup_css(memcg)); -+ -+ return memcg; -+} -+#else -+static struct mem_cgroup* swap_token_memcg_from_mm(struct mm_struct *mm) -+{ -+ return NULL; -+} -+#endif -+ - void grab_swap_token(struct mm_struct *mm) - { - int current_interval; - unsigned int old_prio = mm->token_priority; -- struct mem_cgroup *memcg; - static unsigned int global_faults; - static unsigned int last_aging; - -@@ -93,12 +110,9 @@ out: - - replace_token: - mm->token_priority += 2; -- memcg = try_get_mem_cgroup_from_mm(mm); -- if (memcg) -- css_put(mem_cgroup_css(memcg)); - trace_replace_swap_token(swap_token_mm, mm); - swap_token_mm = mm; -- swap_token_memcg = memcg; -+ swap_token_memcg = swap_token_memcg_from_mm(mm); - last_aging = global_faults; - goto out; - } --- -1.7.3.1 diff --git a/a/content_digest b/N1/content_digest index 34e3a31..fda834a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -20,81 +20,6 @@ "\n" "My bad. Following patch fixes this issue.\n" "\n" - "Thanks.\n" - "\n" - "\n" - "\n" - ">From 6a824b46219cb2f11b125e9a33f65e0f01899d09 Mon Sep 17 00:00:00 2001\n" - "From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\n" - "Date: Mon, 30 May 2011 15:47:32 +0900\n" - "Subject: [PATCH] swap-token: fix compilation error when CONFIG_CGROUPS=n\n" - "\n" - "Andrew Morton pointed out css_put() is not defined when\n" - "CONFIG_CGROUPS=n.\n" - "\n" - ": CONFIG_CGROUPS=n:\n" - ":\n" - ": mm/thrash.c: In function 'grab_swap_token':\n" - ": mm/thrash.c:73: error: implicit declaration of function 'css_put'\n" - "\n" - "Thus, this patch move the whole logic into CONFIG_CGROUP_MEM_RES_CTLR\n" - "condtion.\n" - "\n" - "Reported-by: Andrew Morton <akpm@linux-foundation.org>\n" - "Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>\n" - "---\n" - " mm/thrash.c | 24 +++++++++++++++++++-----\n" - " 1 files changed, 19 insertions(+), 5 deletions(-)\n" - "\n" - "diff --git a/mm/thrash.c b/mm/thrash.c\n" - "index 8832edb..cd06606 100644\n" - "--- a/mm/thrash.c\n" - "+++ b/mm/thrash.c\n" - "@@ -31,11 +31,28 @@ static DEFINE_SPINLOCK(swap_token_lock);\n" - " struct mm_struct *swap_token_mm;\n" - " struct mem_cgroup *swap_token_memcg;\n" - "\n" - "+#ifdef CONFIG_CGROUP_MEM_RES_CTLR\n" - "+static struct mem_cgroup* swap_token_memcg_from_mm(struct mm_struct *mm)\n" - "+{\n" - "+\tstruct mem_cgroup *memcg;\n" - "+\n" - "+\tmemcg = try_get_mem_cgroup_from_mm(mm);\n" - "+\tif (memcg)\n" - "+\t\tcss_put(mem_cgroup_css(memcg));\n" - "+\n" - "+\treturn memcg;\n" - "+}\n" - "+#else\n" - "+static struct mem_cgroup* swap_token_memcg_from_mm(struct mm_struct *mm)\n" - "+{\n" - "+\treturn NULL;\n" - "+}\n" - "+#endif\n" - "+\n" - " void grab_swap_token(struct mm_struct *mm)\n" - " {\n" - " \tint current_interval;\n" - " \tunsigned int old_prio = mm->token_priority;\n" - "-\tstruct mem_cgroup *memcg;\n" - " \tstatic unsigned int global_faults;\n" - " \tstatic unsigned int last_aging;\n" - "\n" - "@@ -93,12 +110,9 @@ out:\n" - "\n" - " replace_token:\n" - " \tmm->token_priority += 2;\n" - "-\tmemcg = try_get_mem_cgroup_from_mm(mm);\n" - "-\tif (memcg)\n" - "-\t\tcss_put(mem_cgroup_css(memcg));\n" - " \ttrace_replace_swap_token(swap_token_mm, mm);\n" - " \tswap_token_mm = mm;\n" - "-\tswap_token_memcg = memcg;\n" - "+\tswap_token_memcg = swap_token_memcg_from_mm(mm);\n" - " \tlast_aging = global_faults;\n" - " \tgoto out;\n" - " }\n" - "-- \n" - 1.7.3.1 + Thanks. -554d7022218daf3938739195605e563ff43af508bf92a6dd6fa708ee22de684c +706ed6a5b926ad9c8e98a3e9642926975e12bd7f3e7a8d16bc285ae52d733caf
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.