summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/suspend.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-05-31 01:33:02 +0100
committerIngo Molnar <mingo@elte.hu>2008-06-02 13:25:34 +0200
commit9c7a794209f8a91f47697c3be20597eb60531e6d (patch)
treec1cdc49e4cf4ee5f80ea24a36e4f9498bdeeaf6b /arch/x86/xen/suspend.c
parente2426cf85f8db5891fb5831323d2d0c176c4dadc (diff)
xen: restore vcpu_info mapping
If we're using vcpu_info mapping, then make sure its restored on all processors before relasing them from stop_machine. The only complication is that if this fails, we can't continue because we've already made assumptions that the mapping is available (baked in calls to the _direct versions of the functions, for example). Fortunately this can only happen with a 32-bit hypervisor, which may possibly run out of mapping space. On a 64-bit hypervisor, this is a non-issue. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/suspend.c')
-rw-r--r--arch/x86/xen/suspend.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 7620a16fe53..7ab10f6b39a 100644
--- 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,8 @@ 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();
}