1 files changed, 6 insertions, 2 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 55a05f1ef76d..f1aba7e7b760 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -60,6 +60,12 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
         }
 
         /*
+         * swapoff can easily use up all memory, so kill those first.
+         */
+        if (p->flags & PF_SWAPOFF)
+                return ULONG_MAX;
+
+        /*
          * The memory size of the process is the basis for the badness.
          */
         points = mm->total_vm;
@@ -230,8 +236,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
                 }
                 if (p->oomkilladj == OOM_DISABLE)
                         continue;
-                if (p->flags & PF_SWAPOFF)
-                        return p;
 
                 points = badness(p, uptime.tv_sec);
                 if (points > *ppoints || !chosen) {