[PATCH] oom: swapoff tasks tweak

[pandora-kernel.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 55a05f1..f1aba7e 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -59,6 +59,12 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
                return 0;
        }
 
+       /*
+        * 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.
         */
@@ -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) {