Merge branch 'core/xen' into x86/xen

This commit is contained in:
Ingo Molnar 2008-09-10 14:05:45 +02:00
commit 3ce9bcb583
941 changed files with 33631 additions and 9902 deletions

View file

@ -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;