diff for duplicates of <20160408131418.GJ29820@dhcp22.suse.cz>
diff --git a/a/1.txt b/N1/1.txt
index cc3e0f8..3149104 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,68 +1,2 @@
Andrew, could you fold this in?
----
->From 9645b0518c20da67decfd2a94b1cc99ef1b4218a Mon Sep 17 00:00:00 2001
-From: Michal Hocko <mhocko@suse.com>
-Date: Fri, 8 Apr 2016 15:11:59 +0200
-Subject: [PATCH] mm, oom_reaper: Try to reap tasks which skip regular memcg
- OOM killer path
-
-no reason to include memcg oom killed tasks as well.
-
-Suggested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-Signed-off-by: Michal Hocko <mhocko@suse.com>
----
- include/linux/oom.h | 8 ++++++++
- mm/memcontrol.c | 1 +
- mm/oom_kill.c | 2 +-
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/oom.h b/include/linux/oom.h
-index 628a43242a34..83b9c39bd8b7 100644
---- a/include/linux/oom.h
-+++ b/include/linux/oom.h
-@@ -72,6 +72,14 @@ static inline bool oom_task_origin(const struct task_struct *p)
-
- extern void mark_oom_victim(struct task_struct *tsk);
-
-+#ifdef CONFIG_MMU
-+extern void try_oom_reaper(struct task_struct *tsk);
-+#else
-+static inline void try_oom_reaper(struct task_struct *tsk)
-+{
-+}
-+#endif
-+
- extern unsigned long oom_badness(struct task_struct *p,
- struct mem_cgroup *memcg, const nodemask_t *nodemask,
- unsigned long totalpages);
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 17a847c96618..6d2f699e4d3d 100644
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -1256,6 +1256,7 @@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
- */
- if (fatal_signal_pending(current) || task_will_free_mem(current)) {
- mark_oom_victim(current);
-+ try_oom_reaper(current);
- goto unlock;
- }
-
-diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index 74c38f5fffef..e656ee2c0be4 100644
---- a/mm/oom_kill.c
-+++ b/mm/oom_kill.c
-@@ -585,7 +585,7 @@ static void wake_oom_reaper(struct task_struct *tsk)
- /* Check if we can reap the given task. This has to be called with stable
- * tsk->mm
- */
--static void try_oom_reaper(struct task_struct *tsk)
-+void try_oom_reaper(struct task_struct *tsk)
- {
- struct mm_struct *mm = tsk->mm;
- struct task_struct *p;
---
-2.8.0.rc3
-
---
-Michal Hocko
-SUSE Labs
\ No newline at end of file
+---
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 62bbddd..9f26743 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -31,73 +31,7 @@
]
[
"Andrew, could you fold this in?\n",
- "---\n",
- ">From 9645b0518c20da67decfd2a94b1cc99ef1b4218a Mon Sep 17 00:00:00 2001\n",
- "From: Michal Hocko <mhocko\@suse.com>\n",
- "Date: Fri, 8 Apr 2016 15:11:59 +0200\n",
- "Subject: [PATCH] mm, oom_reaper: Try to reap tasks which skip regular memcg\n",
- " OOM killer path\n",
- "\n",
- "no reason to include memcg oom killed tasks as well.\n",
- "\n",
- "Suggested-by: Tetsuo Handa <penguin-kernel\@I-love.SAKURA.ne.jp>\n",
- "Signed-off-by: Michal Hocko <mhocko\@suse.com>\n",
- "---\n",
- " include/linux/oom.h | 8 ++++++++\n",
- " mm/memcontrol.c | 1 +\n",
- " mm/oom_kill.c | 2 +-\n",
- " 3 files changed, 10 insertions(+), 1 deletion(-)\n",
- "\n",
- "diff --git a/include/linux/oom.h b/include/linux/oom.h\n",
- "index 628a43242a34..83b9c39bd8b7 100644\n",
- "--- a/include/linux/oom.h\n",
- "+++ b/include/linux/oom.h\n",
- "\@\@ -72,6 +72,14 \@\@ static inline bool oom_task_origin(const struct task_struct *p)\n",
- " \n",
- " extern void mark_oom_victim(struct task_struct *tsk);\n",
- " \n",
- "+#ifdef CONFIG_MMU\n",
- "+extern void try_oom_reaper(struct task_struct *tsk);\n",
- "+#else\n",
- "+static inline void try_oom_reaper(struct task_struct *tsk)\n",
- "+{\n",
- "+}\n",
- "+#endif\n",
- "+\n",
- " extern unsigned long oom_badness(struct task_struct *p,\n",
- " \t\tstruct mem_cgroup *memcg, const nodemask_t *nodemask,\n",
- " \t\tunsigned long totalpages);\n",
- "diff --git a/mm/memcontrol.c b/mm/memcontrol.c\n",
- "index 17a847c96618..6d2f699e4d3d 100644\n",
- "--- a/mm/memcontrol.c\n",
- "+++ b/mm/memcontrol.c\n",
- "\@\@ -1256,6 +1256,7 \@\@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,\n",
- " \t */\n",
- " \tif (fatal_signal_pending(current) || task_will_free_mem(current)) {\n",
- " \t\tmark_oom_victim(current);\n",
- "+\t\ttry_oom_reaper(current);\n",
- " \t\tgoto unlock;\n",
- " \t}\n",
- " \n",
- "diff --git a/mm/oom_kill.c b/mm/oom_kill.c\n",
- "index 74c38f5fffef..e656ee2c0be4 100644\n",
- "--- a/mm/oom_kill.c\n",
- "+++ b/mm/oom_kill.c\n",
- "\@\@ -585,7 +585,7 \@\@ static void wake_oom_reaper(struct task_struct *tsk)\n",
- " /* Check if we can reap the given task. This has to be called with stable\n",
- " * tsk->mm\n",
- " */\n",
- "-static void try_oom_reaper(struct task_struct *tsk)\n",
- "+void try_oom_reaper(struct task_struct *tsk)\n",
- " {\n",
- " \tstruct mm_struct *mm = tsk->mm;\n",
- " \tstruct task_struct *p;\n",
- "-- \n",
- "2.8.0.rc3\n",
- "\n",
- "-- \n",
- "Michal Hocko\n",
- "SUSE Labs"
+ "---"
]
-7ffc6a7f2efe53610aa9137f18a2eff46b29a643d9ba9019f52bc7aaec3022dd
+108a4552ad2c30684f9872dc4071997f977424981fa437b5fd8d861748ac5950
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.