]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86/xen: don't reset vcpu_info on a cancelled suspend
authorOuyang Zhaowei (Charles) <ouyangzhaowei@huawei.com>
Wed, 6 May 2015 01:47:04 +0000 (09:47 +0800)
committerDaniel Kiper <daniel.kiper@oracle.com>
Tue, 10 May 2016 20:14:55 +0000 (22:14 +0200)
commit5aed3fd822e391f45fb27d68fc7ff32c8d832575
treedcebf4afbf2d1e6dc594363fc909bce85817926b
parentd53358baa7a5bc3cd310de7a3d32ca163387d43d
x86/xen: don't reset vcpu_info on a cancelled suspend

On a cancelled suspend the vcpu_info location does not change (it's
still in the per-cpu area registered by xen_vcpu_setup()).  So do not
call xen_hvm_init_shared_info() which would make the kernel think its
back in the shared info.  With the wrong vcpu_info, events cannot be
received and the domain will hang after a cancelled suspend.

Signed-off-by: Charles Ouyang <ouyangzhaowei@huawei.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
(cherry picked from commit 6a1f513776b78c994045287073e55bae44ed9f8c)
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Conflicts:
arch/x86/xen/suspend.c
arch/x86/xen/suspend.c