summaryrefslogtreecommitdiff
path: root/arch/x86/xen/suspend.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-08-16 19:31:27 +0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-08-16 21:05:25 +0400
commitca08649eb5dd30f11a5a8fe8659b48899b7ea6a1 (patch)
treeb1ab10ebec723a22034e1ae8dc2c975b293774ab /arch/x86/xen/suspend.c
parent5bc6f9888db5739abfa0cae279b4b442e4db8049 (diff)
downloadlinux-ca08649eb5dd30f11a5a8fe8659b48899b7ea6a1.tar.xz
Revert "xen PVonHVM: move shared_info to MMIO before kexec"
This reverts commit 00e37bdb0113a98408de42db85be002f21dbffd3. During shutdown of PVHVM guests with more than 2VCPUs on certain machines we can hit the race where the replaced shared_info is not replaced fast enough and the PV time clock retries reading the same area over and over without any any success and is stuck in an infinite loop. Acked-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/suspend.c')
-rw-r--r--arch/x86/xen/suspend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index ae8a00c39de4..45329c8c226e 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -30,7 +30,7 @@ void xen_arch_hvm_post_suspend(int suspend_cancelled)
{
#ifdef CONFIG_XEN_PVHVM
int cpu;
- xen_hvm_resume_shared_info();
+ xen_hvm_init_shared_info();
xen_callback_vector();
xen_unplug_emulated_devices();
if (xen_feature(XENFEAT_hvm_safe_pvclock)) {