dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

xen: suspend: add "arch" to pre/post suspend hooks 

xen_pre_device_suspend is unused on ia64.

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 36b401e2c2
commit 03c8142bd2
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/ia64/xen/suspend.c
View File

@ -37,19 +37,14 @@ xen_mm_unpin_all(void)
/* nothing */
}
void xen_pre_device_suspend(void)
void
xen_arch_pre_suspend()
{
/* nothing */
}
void
xen_pre_suspend()
{
/* nothing */
}
void
xen_post_suspend(int suspend_cancelled)
xen_arch_post_suspend(int suspend_cancelled)
{
if (suspend_cancelled)
return;

6
arch/x86/xen/suspend.c
View File

@ -12,7 +12,7 @@
#include "xen-ops.h"
#include "mmu.h"
void xen_pre_suspend(void)
void xen_arch_pre_suspend(void)
{
xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);
xen_start_info->console.domU.mfn =
@ -26,7 +26,7 @@ void xen_pre_suspend(void)
BUG();
}
void xen_hvm_post_suspend(int suspend_cancelled)
void xen_arch_hvm_post_suspend(int suspend_cancelled)
{
#ifdef CONFIG_XEN_PVHVM
int cpu;
@ -41,7 +41,7 @@ void xen_hvm_post_suspend(int suspend_cancelled)
#endif
}
void xen_post_suspend(int suspend_cancelled)
void xen_arch_post_suspend(int suspend_cancelled)
{
xen_build_mfn_list_list();

6
drivers/xen/manage.c
View File

@ -61,7 +61,7 @@ static int xen_hvm_suspend(void *data)
*/
si->cancelled = HYPERVISOR_suspend(si->arg);
xen_hvm_post_suspend(si->cancelled);
xen_arch_hvm_post_suspend(si->cancelled);
gnttab_resume();
if (!si->cancelled) {
@ -91,7 +91,7 @@ static int xen_suspend(void *data)
xen_mm_pin_all();
gnttab_suspend();
xen_pre_suspend();
xen_arch_pre_suspend();
/*
* This hypercall returns 1 if suspend was cancelled
@ -100,7 +100,7 @@ static int xen_suspend(void *data)
*/
si->cancelled = HYPERVISOR_suspend(si->arg);
xen_post_suspend(si->cancelled);
xen_arch_post_suspend(si->cancelled);
gnttab_resume();
xen_mm_unpin_all();

6
include/xen/xen-ops.h
View File

@ -5,9 +5,9 @@
DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
void xen_pre_suspend(void);
void xen_post_suspend(int suspend_cancelled);
void xen_hvm_post_suspend(int suspend_cancelled);
void xen_arch_pre_suspend(void);
void xen_arch_post_suspend(int suspend_cancelled);
void xen_arch_hvm_post_suspend(int suspend_cancelled);
void xen_mm_pin_all(void);
void xen_mm_unpin_all(void);