Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / x86 / xen / suspend_pv.c

diff --git a/arch/x86/xen/suspend_pv.c b/arch/x86/xen/suspend_pv.c
index a2e0f110af56ddac120b382691dcf61e70e3db14..8303b58c79a983085235a29c1b6aa653f11d1091 100644 (file)
--- a/arch/x86/xen/suspend_pv.c
+++ b/arch/x86/xen/suspend_pv.c
@@ -27,8 +27,9 @@ void xen_pv_pre_suspend(void)
 void xen_pv_post_suspend(int suspend_cancelled)
 {
        xen_build_mfn_list_list();
-
-       xen_setup_shared_info();
+       set_fixmap(FIX_PARAVIRT_BOOTMAP, xen_start_info->shared_info);
+       HYPERVISOR_shared_info = (void *)fix_to_virt(FIX_PARAVIRT_BOOTMAP);
+       xen_setup_mfn_list_list();
 
        if (suspend_cancelled) {
                xen_start_info->store_mfn =