AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

xen: suspend: remove xen_hvm_suspend

Browse Source 
It is now identical to xen_suspend, the differences are encapsulated
in the suspend_info struct.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Ian Campbell 2011-02-17 11:04:20 +00:00 committed by Stefano Stabellini
parent 55fb4acef7
commit b056b6a014
1 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/xen/manage.c
View File

@ -62,44 +62,6 @@ static void xen_post_suspend(int cancelled)
}
#ifdef CONFIG_PM_SLEEP
static int xen_hvm_suspend(void *data)
{
struct suspend_info *si = data;
int err;
BUG_ON(!irqs_disabled());
err = sysdev_suspend(PMSG_SUSPEND);
if (err) {
printk(KERN_ERR "xen_hvm_suspend: sysdev_suspend failed: %d\n",
err);
return err;
}
if (si->pre)
si->pre();
/*
* This hypercall returns 1 if suspend was cancelled
* or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain.
*/
si->cancelled = HYPERVISOR_suspend(si->arg);
if (si->post)
si->post(si->cancelled);
if (!si->cancelled) {
xen_irq_resume();
xen_console_resume();
xen_timer_resume();
}
sysdev_resume();
return 0;
}
static int xen_suspend(void *data)
{
struct suspend_info *si = data;
@ -183,10 +145,7 @@ static void do_suspend(void)
si.post = &xen_post_suspend;
}
if (xen_hvm_domain())
err = stop_machine(xen_hvm_suspend, &si, cpumask_of(0));
else
err = stop_machine(xen_suspend, &si, cpumask_of(0));
err = stop_machine(xen_suspend, &si, cpumask_of(0));
dpm_resume_noirq(PMSG_RESUME);