The patch titled
Subject: include/linux/oom.h: move enum oom_constraint in oom.h
has been removed from the -mm tree. Its filename was
move-enum-oom_constraint-in-oomh.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: yuzhoujian <yuzhoujian@xxxxxxxxxxxxxxx>
Subject: include/linux/oom.h: move enum oom_constraint in oom.h
Preparation for the follow-up patch: Refactor part of the oom report in
dump_header. It puts enum oom_constraint in oom.h.
Link: http://lkml.kernel.org/r/1529763171-29240-1-git-send-email-ufo19890607@xxxxxxxxx
Signed-off-by: yuzhoujian <yuzhoujian@xxxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Yang Shi <yang.s@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN include/linux/memcontrol.h~move-enum-oom_constraint-in-oomh include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~move-enum-oom_constraint-in-oomh
+++ a/include/linux/memcontrol.h
@@ -28,6 +28,7 @@
#include <linux/eventfd.h>
#include <linux/mm.h>
#include <linux/vmstat.h>
+#include <linux/oom.h>
#include <linux/writeback.h>
#include <linux/page-flags.h>
diff -puN include/linux/oom.h~move-enum-oom_constraint-in-oomh include/linux/oom.h
--- a/include/linux/oom.h~move-enum-oom_constraint-in-oomh
+++ a/include/linux/oom.h
@@ -15,6 +15,13 @@ struct notifier_block;
struct mem_cgroup;
struct task_struct;
+enum oom_constraint {
+ CONSTRAINT_NONE,
+ CONSTRAINT_CPUSET,
+ CONSTRAINT_MEMORY_POLICY,
+ CONSTRAINT_MEMCG,
+};
+
/*
* Details of the page allocation that triggered the oom killer that are used to
* determine what should be killed.
diff -puN mm/oom_kill.c~move-enum-oom_constraint-in-oomh mm/oom_kill.c
--- a/mm/oom_kill.c~move-enum-oom_constraint-in-oomh
+++ a/mm/oom_kill.c
@@ -237,13 +237,6 @@ unsigned long oom_badness(struct task_st
return points > 0 ? points : 1;
}
-enum oom_constraint {
- CONSTRAINT_NONE,
- CONSTRAINT_CPUSET,
- CONSTRAINT_MEMORY_POLICY,
- CONSTRAINT_MEMCG,
-};
-
/*
* Determine the type of allocation constraint.
*/
_
Patches currently in -mm which might be from yuzhoujian@xxxxxxxxxxxxxxx are
refactor-part-of-the-oom-report-in-dump_header.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
