summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/suspend.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-12-23 08:41:14 +0100
committerGrant Likely <grant.likely@secretlab.ca>2010-12-23 08:41:14 +0100
commitcfb13c5db08c90311a5defdde9a0328ee788cca5 (patch)
tree842cb60d1d19b99e550fdbc653723e4b13e51ee5 /arch/x86/xen/suspend.c
parentof/net: Move of_get_mac_address() to a common source file. (diff)
parentLinux 2.6.37-rc7 (diff)
downloadlinux-cfb13c5db08c90311a5defdde9a0328ee788cca5.tar.xz
linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.zip
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'arch/x86/xen/suspend.c')
-rw-r--r--arch/x86/xen/suspend.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 1d789d56877c..9bbd63a129b5 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -31,6 +31,7 @@ void xen_hvm_post_suspend(int suspend_cancelled)
int cpu;
xen_hvm_init_shared_info();
xen_callback_vector();
+ xen_unplug_emulated_devices();
if (xen_feature(XENFEAT_hvm_safe_pvclock)) {
for_each_online_cpu(cpu) {
xen_setup_runstate_info(cpu);