Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index ff3a6182f5f0df3fb479cbd56092dd0ee8e1ff2e..e1c4131204698fd891af0b8046406ae4fd0ff76a 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -20,6 +20,7 @@
 #include <linux/cpu.h>
 #include <linux/resume-trace.h>
 #include <linux/freezer.h>
+#include <linux/vmstat.h>
 
 #include "power.h"
 
@@ -43,6 +44,11 @@ void pm_set_ops(struct pm_ops * ops)
        mutex_unlock(&pm_mutex);
 }
 
+static inline void pm_finish(suspend_state_t state)
+{
+       if (pm_ops->finish)
+               pm_ops->finish(state);
+}
 
 /**
  *     suspend_prepare - Do prep work before entering low-power state.
@@ -63,16 +69,13 @@ static int suspend_prepare(suspend_state_t state)
 
        pm_prepare_console();
 
-       error = disable_nonboot_cpus();
-       if (error)
-               goto Enable_cpu;
-
        if (freeze_processes()) {
                error = -EAGAIN;
                goto Thaw;
        }
 
-       if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) {
+       if ((free_pages = global_page_state(NR_FREE_PAGES))
+                       < FREE_PAGE_NUMBER) {
                pr_debug("PM: free some memory\n");
                shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
                if (nr_free_pages() < FREE_PAGE_NUMBER) {
@@ -88,18 +91,22 @@ static int suspend_prepare(suspend_state_t state)
        }
 
        suspend_console();
-       if ((error = device_suspend(PMSG_SUSPEND))) {
+       error = device_suspend(PMSG_SUSPEND);
+       if (error) {
                printk(KERN_ERR "Some devices failed to suspend\n");
-               goto Finish;
+               goto Resume_devices;
        }
-       return 0;
- Finish:
-       if (pm_ops->finish)
-               pm_ops->finish(state);
+       error = disable_nonboot_cpus();
+       if (!error)
+               return 0;
+
+       enable_nonboot_cpus();
+ Resume_devices:
+       pm_finish(state);
+       device_resume();
+       resume_console();
  Thaw:
        thaw_processes();
- Enable_cpu:
-       enable_nonboot_cpus();
        pm_restore_console();
        return error;
 }
@@ -134,12 +141,11 @@ int suspend_enter(suspend_state_t state)
 
 static void suspend_finish(suspend_state_t state)
 {
+       enable_nonboot_cpus();
+       pm_finish(state);
        device_resume();
        resume_console();
        thaw_processes();
-       enable_nonboot_cpus();
-       if (pm_ops && pm_ops->finish)
-               pm_ops->finish(state);
        pm_restore_console();
 }