Merge branch 'linus' into timers/nohz

1 files changed, 45 insertions, 0 deletions

diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
new file mode 100644
index 000000000000..251669a932d4
--- /dev/null
+++ b/arch/x86/xen/suspend.c
@@ -0,0 +1,45 @@
+#include <linux/types.h>
+
+#include <xen/interface/xen.h>
+#include <xen/grant_table.h>
+#include <xen/events.h>
+
+#include <asm/xen/hypercall.h>
+#include <asm/xen/page.h>
+
+#include "xen-ops.h"
+#include "mmu.h"
+
+void xen_pre_suspend(void)
+{
+        xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);
+        xen_start_info->console.domU.mfn =
+                mfn_to_pfn(xen_start_info->console.domU.mfn);
+
+        BUG_ON(!irqs_disabled());
+
+        HYPERVISOR_shared_info = &xen_dummy_shared_info;
+        if (HYPERVISOR_update_va_mapping(fix_to_virt(FIX_PARAVIRT_BOOTMAP),
+                                         __pte_ma(0), 0))
+                BUG();
+}
+
+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);
+                xen_start_info->console.domU.mfn =
+                        pfn_to_mfn(xen_start_info->console.domU.mfn);
+        } else {
+#ifdef CONFIG_SMP
+                xen_cpu_initialized_map = cpu_online_map;
+#endif
+                xen_vcpu_restore();
+                xen_timer_resume();
+        }
+
+}
+