[PATCH -mm 1/4] PM: Change code ordering in main.c

[Rafael J. Wysocki]

Change the ordering of code in kernel/power/main.c so that device_suspend()
is called before disable_nonboot_cpus() and pm_ops->finish() is called after
enable_nonboot_cpus() and before device_resume(), as indicated by recent
discussion on Linux-PM
(cf. http://lists.osdl.org/pipermail/linux-pm/2006-November/004164.html).

Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
Acked-by: Pavel Machek <[EMAIL PROTECTED]>
---
 kernel/power/main.c |   34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

Index: linux-2.6.20-rc1-mm1/kernel/power/main.c
===================================================================
--- linux-2.6.20-rc1-mm1.orig/kernel/power/main.c
+++ linux-2.6.20-rc1-mm1/kernel/power/main.c
@@ -43,6 +43,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,10 +68,6 @@ static int suspend_prepare(suspend_state
 
        pm_prepare_console();
 
-       error = disable_nonboot_cpus();
-       if (error)
-               goto Enable_cpu;
-
        if (freeze_processes()) {
                error = -EAGAIN;
                goto Thaw;
@@ -88,18 +89,22 @@ static int suspend_prepare(suspend_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 +139,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();
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/