]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.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)
committerDavid Vrabel <david.vrabel@citrix.com>
Mon, 4 Jan 2016 11:49:25 +0000 (11:49 +0000)
commit6a1f513776b78c994045287073e55bae44ed9f8c
tree8b57b75283438e0ecc7b57dc550af24389d20f17
parentb9c0a92a9aa953e5a98f2af2098c747d4358c7bb
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>
arch/x86/xen/suspend.c