---

yaml --- r: 174431 b: refs/heads/master c: b4606f2 h: refs/heads/master i: 174429: 58e9bcc 174427: f438f3e 174423: 6376974 174415: fb7f438 174399: 2e77924 v: v3
git-mirror · Dec 3, 2009 · a30ade1 · a30ade1
1 parent 82e7d66
commit a30ade1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65f63384b391bf4d384327d8a7c6de9860290b5c
+refs/heads/master: b4606f2165153833247823e8c04c5e88cb3d298b
diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c
@@ -79,14 +79,20 @@ static void do_suspend(void)
 
 	shutting_down = SHUTDOWN_SUSPEND;
 
+	err = stop_machine_create();
+	if (err) {
+		printk(KERN_ERR "xen suspend: failed to setup stop_machine %d\n", err);
+		goto out;
+	}
+
 #ifdef CONFIG_PREEMPT
 	/* If the kernel is preemptible, we need to freeze all the processes
 	   to prevent them from being in the middle of a pagetable update
 	   during suspend. */
 	err = freeze_processes();
 	if (err) {
 		printk(KERN_ERR "xen suspend: freeze failed %d\n", err);
-		goto out;
+		goto out_destroy_sm;
 	}
 #endif
 
@@ -129,7 +135,11 @@ static void do_suspend(void)
 out_thaw:
 #ifdef CONFIG_PREEMPT
 	thaw_processes();
+
+out_destroy_sm:
 #endif
+	stop_machine_destroy();
+
 out:
 	shutting_down = SHUTDOWN_INVALID;
 }