---

yaml --- r: 222925 b: refs/heads/master c: 512b109 h: refs/heads/master i: 222923: a87c4d4 v: v3
git-mirror · Dec 2, 2010 · 36632dc · 36632dc
1 parent 5c8544c
commit 36632dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@