Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / x86 / xen / suspend.c

diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 7620a16fe535085f1a8f93bdb2f2e0d7c06895c7..2a234db5949beb39e21e5fa09089c3740d802940 100644 (file)
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -26,6 +26,8 @@ void xen_pre_suspend(void)
 
 void xen_post_suspend(int suspend_cancelled)
 {
+       xen_setup_shared_info();
+
        if (suspend_cancelled) {
                xen_start_info->store_mfn =
                        pfn_to_mfn(xen_start_info->store_mfn);
@@ -35,8 +37,12 @@ void xen_post_suspend(int suspend_cancelled)
 #ifdef CONFIG_SMP
                xen_cpu_initialized_map = cpu_online_map;
 #endif
+               xen_vcpu_restore();
        }
 
-       xen_setup_shared_info();
 }
 
+void xen_arch_resume(void)
+{
+       /* nothing */
+}