Merge branch 'core/xen' into x86/xen

2008-09-10 14:05:45 +02:00
parent 26fd10517e f7d0b926ac
commit 3ce9bcb583
941 changed files with 33672 additions and 9943 deletions
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -102,7 +102,7 @@ static void do_suspend(void)
 	/* XXX use normal device tree? */
 	xenbus_suspend();

-	err = stop_machine_run(xen_suspend, &cancelled, 0);
+	err = stop_machine(xen_suspend, &cancelled, &cpumask_of_cpu(0));
 	if (err) {
 		printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
 		goto out;