PM / Sleep: Introduce "late suspend" and "early resume" of devices

[mv-sheeva.git] / drivers / xen / manage.c

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index ce4fa0831860175dedd4b53d3cd22e168474f7b9..9e14ae6cd49c018bf45156d58c1ff4af7411fdc3 100644 (file)
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -129,9 +129,9 @@ static void do_suspend(void)
        printk(KERN_DEBUG "suspending xenstore...\n");
        xs_suspend();
 
-       err = dpm_suspend_noirq(PMSG_FREEZE);
+       err = dpm_suspend_end(PMSG_FREEZE);
        if (err) {
-               printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
+               printk(KERN_ERR "dpm_suspend_end failed: %d\n", err);
                goto out_resume;
        }
 
@@ -149,7 +149,7 @@ static void do_suspend(void)
 
        err = stop_machine(xen_suspend, &si, cpumask_of(0));
 
-       dpm_resume_noirq(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
+       dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
 
        if (err) {
                printk(KERN_ERR "failed to start xen_suspend: %d\n", err);