X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fxen%2Fmanage.c;h=8943b8ccee1a2ba3c35ac8eabfc14bd716fb136c;hb=3fc1f1e27a5b807791d72e5d992aa33b668a6626;hp=0d61db1e7b49bc5f5fd095795e74001dadda1bc3;hpb=2ed8d2b3a81bdbb0418301628ccdb008ac9f40b7;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 0d61db1..8943b8c 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -3,6 +3,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 #include <linux/reboot.h>
 #include <linux/sysrq.h>
 #include <linux/stop_machine.h>
@@ -43,7 +44,6 @@ static int xen_suspend(void *data)
 	if (err) {
 		printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
 			err);
-		device_power_up(PMSG_RESUME);
 		return err;
 	}
 
@@ -62,14 +62,14 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	sysdev_resume();
-
 	if (!*cancelled) {
 		xen_irq_resume();
 		xen_console_resume();
 		xen_timer_resume();
 	}
 
+	sysdev_resume();
+
 	return 0;
 }
 
@@ -87,48 +87,50 @@ static void do_suspend(void)
 	err = freeze_processes();
 	if (err) {
 		printk(KERN_ERR "xen suspend: freeze failed %d\n", err);
-		return;
+		goto out;
 	}
 #endif
 
-	err = device_suspend(PMSG_SUSPEND);
+	err = dpm_suspend_start(PMSG_SUSPEND);
 	if (err) {
-		printk(KERN_ERR "xen suspend: device_suspend %d\n", err);
-		goto out;
+		printk(KERN_ERR "xen suspend: dpm_suspend_start %d\n", err);
+		goto out_thaw;
 	}
 
-	printk("suspending xenbus...\n");
-	/* XXX use normal device tree? */
-	xenbus_suspend();
+	printk(KERN_DEBUG "suspending xenstore...\n");
+	xs_suspend();
 
-	err = device_power_down(PMSG_SUSPEND);
+	err = dpm_suspend_noirq(PMSG_SUSPEND);
 	if (err) {
-		printk(KERN_ERR "device_power_down failed: %d\n", err);
-		goto resume_devices;
+		printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
+		goto out_resume;
 	}
 
 	err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
+
+	dpm_resume_noirq(PMSG_RESUME);
+
 	if (err) {
 		printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
-		goto out;
+		cancelled = 1;
 	}
 
+out_resume:
 	if (!cancelled) {
 		xen_arch_resume();
-		xenbus_resume();
+		xs_resume();
 	} else
-		xenbus_suspend_cancel();
-
-	device_power_up(PMSG_RESUME);
+		xs_suspend_cancel();
 
-resume_devices:
-	device_resume(PMSG_RESUME);
+	dpm_resume_end(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();
-out:
+
+out_thaw:
 #ifdef CONFIG_PREEMPT
 	thaw_processes();
+out:
 #endif
 	shutting_down = SHUTDOWN_INVALID;
 }