Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 4285b59..873b6db 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -231,12 +231,6 @@ void out_of_memory(void)
        static unsigned long first, last, count, lastkill;
        unsigned long now, since;
 
-       /*
-        * Enough swap space left?  Not OOM.
-        */
-       if (nr_swap_pages > 0)
-               return;
-
        spin_lock(&oom_lock);
        now = jiffies;
        since = now - last;