1 files changed, 5 insertions, 0 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 3a1d46502938..5ec8da12cfd9 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -20,6 +20,7 @@
 #include <linux/swap.h>
 #include <linux/timex.h>
 #include <linux/jiffies.h>
+#include <linux/cpuset.h>
 
 /* #define DEBUG */
 
@@ -152,6 +153,10 @@ static struct task_struct * select_bad_process(void)
                         continue;
                 if (p->oomkilladj == OOM_DISABLE)
                         continue;
+                /* If p's nodes don't overlap ours, it won't help to kill p. */
+                if (!cpuset_excl_nodes_overlap(p))
+                        continue;
+
                 /*
                  * This is in the process of releasing memory so for wait it
                  * to finish before killing some other task by mistake.