[PATCH] Change the name of pagedir_nosave

[~andy/linux] / kernel / power / disk.c

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index e13e740678456c6e20e97af70724fdebe2106dcd..7c7b9b65e365058935a5d5b77ac807b2d669df59 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -18,6 +18,7 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/pm.h>
+#include <linux/cpu.h>
 
 #include "power.h"
 
@@ -72,7 +73,10 @@ static int prepare_processes(void)
        int error;
 
        pm_prepare_console();
-       disable_nonboot_cpus();
+
+       error = disable_nonboot_cpus();
+       if (error)
+               goto enable_cpus;
 
        if (freeze_processes()) {
                error = -EBUSY;
@@ -84,6 +88,7 @@ static int prepare_processes(void)
                return 0;
 thaw:
        thaw_processes();
+enable_cpus:
        enable_nonboot_cpus();
        pm_restore_console();
        return error;