diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-02-14 21:29:31 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-02-14 21:29:31 -0500 |
| commit | e9daff24a266307943457086533041bd971d0ef9 (patch) | |
| tree | 24fd8a6567c89dec76b300d5cd6d7547a24547e8 /arch/x86/xen/suspend.c | |
| parent | 5eb65be2d9a1f7c5e2b95aede16e7eab1cdb67e2 (diff) | |
| download | linux-e9daff24a266307943457086533041bd971d0ef9.tar.bz2 | |
Revert "xen PVonHVM: use E820_Reserved area for shared_info"
This reverts commit 9d02b43dee0d7fb18dfb13a00915550b1a3daa9f.
We are doing this b/c on 32-bit PVonHVM with older hypervisors
(Xen 4.1) it ends up bothing up the start_info. This is bad b/c
we use it for the time keeping, and the timekeeping code loops
forever - as the version field never changes. Olaf says to
revert it, so lets do that.
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.c | 2 |
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)) { |