mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

xen: suspend: move arch specific pre/post suspend hooks into generic hooks

Browse source 
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 82043bb60d
commit 07af38102f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/xen/manage.c
View file

@ -39,8 +39,9 @@ struct suspend_info {
unsigned long arg; /* extra hypercall argument */
};
static void xen_hvm_post_suspend(void)
static void xen_hvm_post_suspend(int cancelled)
{
xen_arch_hvm_post_suspend(cancelled);
gnttab_resume();
}
@ -48,10 +49,12 @@ static void xen_pre_suspend(void)
{
xen_mm_pin_all();
gnttab_suspend();
xen_arch_pre_suspend();
}
static void xen_post_suspend(void)
static void xen_post_suspend(int cancelled)
{
xen_arch_post_suspend(cancelled);
gnttab_resume();
xen_mm_unpin_all();
}
@ -78,8 +81,7 @@ static int xen_hvm_suspend(void *data)
*/
si->cancelled = HYPERVISOR_suspend(si->arg);
xen_arch_hvm_post_suspend(si->cancelled);
xen_hvm_post_suspend();
xen_hvm_post_suspend(si->cancelled);
if (!si->cancelled) {
xen_irq_resume();
@ -107,7 +109,6 @@ static int xen_suspend(void *data)
}
xen_pre_suspend();
xen_arch_pre_suspend();
/*
* This hypercall returns 1 if suspend was cancelled
@ -116,8 +117,7 @@ static int xen_suspend(void *data)
*/
si->cancelled = HYPERVISOR_suspend(si->arg);
xen_arch_post_suspend(si->cancelled);
xen_post_suspend();
xen_post_suspend(si->cancelled);
if (!si->cancelled) {
xen_irq_resume();