mm, PM/Freezer: Disable OOM killer when tasks are frozen
[linux-2.6.git] / kernel / power / process.c
index ca63401..da2072d 100644 (file)
@@ -117,9 +117,12 @@ int freeze_processes(void)
        if (error)
                goto Exit;
        printk("done.");
+
+       oom_killer_disable();
  Exit:
        BUG_ON(in_atomic());
        printk("\n");
+
        return error;
 }
 
@@ -145,6 +148,8 @@ static void thaw_tasks(bool nosig_only)
 
 void thaw_processes(void)
 {
+       oom_killer_enable();
+
        printk("Restarting tasks ... ");
        thaw_tasks(true);
        thaw_tasks(false);