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>

diff --git a/arch/ia64/xen/suspend.c b/arch/ia64/xen/suspend.c
index fd66b048c6fa2b719de1f983779aaf91175b7942..419c8620945ae2dd4d8e710a947470986b025e86 100644 (file)
--- a/arch/ia64/xen/suspend.c
+++ b/arch/ia64/xen/suspend.c
@@ -37,19 +37,14 @@ xen_mm_unpin_all(void)
        /* nothing */
 }
 
-void xen_pre_device_suspend(void)
-{
-       /* nothing */
-}
-
 void
-xen_pre_suspend()
+xen_arch_pre_suspend()
 {
        /* nothing */
 }
 
 void
-xen_post_suspend(int suspend_cancelled)
+xen_arch_post_suspend(int suspend_cancelled)
 {
        if (suspend_cancelled)
                return;

diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 4a3d3dd3dd308c2438f9c4eacd3d75a8e7341b63..45329c8c226e4c4070f16a791b300265a0bf472b 100644 (file)
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -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();
 

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 6ce6b91e7645954fb9ccb574adf65478928cc6d5..134eb73ca59669dcc1ac081b0083e17cb63f30df 100644 (file)
--- 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();
 

diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 98b92154a2645407808c74ba9326e735f84b75af..03c85d7387fb7be265dad680dd50ba13b5425341 100644 (file)
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -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);