From 36632dc182fcb66e3a0860ec270ede2c3620d9bf Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 1 Dec 2010 14:51:44 +0000 Subject: [PATCH] --- yaml --- r: 222925 b: refs/heads/master c: 512b109ec9620d037d6d2f6bd1bae9ce34dd6779 h: refs/heads/master i: 222923: a87c4d434ce675221e8f53bfcc83c71c8a864b56 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/platform-pci-unplug.c | 2 +- trunk/arch/x86/xen/suspend.c | 1 + trunk/arch/x86/xen/xen-ops.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8f91b0ab0ebb..4a6baecaf551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a069c33c53c2e72ec1b76106be73df044af0195 +refs/heads/master: 512b109ec9620d037d6d2f6bd1bae9ce34dd6779 diff --git a/trunk/arch/x86/xen/platform-pci-unplug.c b/trunk/arch/x86/xen/platform-pci-unplug.c index 0f456386cce5..25c52f94a27c 100644 --- a/trunk/arch/x86/xen/platform-pci-unplug.c +++ b/trunk/arch/x86/xen/platform-pci-unplug.c @@ -68,7 +68,7 @@ static int __init check_platform_magic(void) return 0; } -void __init xen_unplug_emulated_devices(void) +void xen_unplug_emulated_devices(void) { int r; diff --git a/trunk/arch/x86/xen/suspend.c b/trunk/arch/x86/xen/suspend.c index 1d789d56877c..9bbd63a129b5 100644 --- a/trunk/arch/x86/xen/suspend.c +++ b/trunk/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); diff --git a/trunk/arch/x86/xen/xen-ops.h b/trunk/arch/x86/xen/xen-ops.h index 64044747348e..9d41bf985757 100644 --- a/trunk/arch/x86/xen/xen-ops.h +++ b/trunk/arch/x86/xen/xen-ops.h @@ -43,7 +43,7 @@ void xen_vcpu_restore(void); void xen_callback_vector(void); void xen_hvm_init_shared_info(void); -void __init xen_unplug_emulated_devices(void); +void xen_unplug_emulated_devices(void); void __init xen_build_dynamic_phys_to_machine(void);