Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / xen / manage.c

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index a5bc91ae6ff69f5d5d4b2e9f49e308acd9126b20..9b91617b9582d320b67ce6c1984663d48659e03d 100644 (file)
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -39,8 +39,6 @@ static int xen_suspend(void *data)
 
        BUG_ON(!irqs_disabled());
 
-       load_cr3(swapper_pg_dir);
-
        err = device_power_down(PMSG_SUSPEND);
        if (err) {
                printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
@@ -102,7 +100,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;