summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorIan Campbell2011-02-17 12:04:20 +0100
committerStefano Stabellini2011-02-25 17:43:12 +0100
commit03c8142bd2fb3b87effa6ecb2f8957be588bc85f (patch)
tree0cb78452092ae9252cd080dcee85c7c60a47e11e /drivers/xen
parentxen: suspend: pass extra hypercall argument via suspend_info struct (diff)
downloadkernel-qcow2-linux-03c8142bd2fb3b87effa6ecb2f8957be588bc85f.tar.gz
kernel-qcow2-linux-03c8142bd2fb3b87effa6ecb2f8957be588bc85f.tar.xz
kernel-qcow2-linux-03c8142bd2fb3b87effa6ecb2f8957be588bc85f.zip
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>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/manage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 6ce6b91e7645..134eb73ca596 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -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();