---

yaml --- r: 234223 b: refs/heads/master c: e057a4b h: refs/heads/master i: 234221: a8fa922 234219: b0bc7f7 234215: abae0a6 234207: 560a3a4 v: v3
git-mirror · Feb 25, 2011 · bed15a0 · bed15a0
1 parent c73162e
commit bed15a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99bbb3a84a99cd04ab16b998b20f01a72cfa9f4f
+refs/heads/master: e057a4b6e0eb6701f6ec923be2075d4984cef51a
diff --git a/trunk/arch/x86/xen/suspend.c b/trunk/arch/x86/xen/suspend.c
@@ -28,6 +28,7 @@ void xen_pre_suspend(void)
 
 void xen_hvm_post_suspend(int suspend_cancelled)
 {
+#ifdef CONFIG_XEN_PVHVM
 	int cpu;
 	xen_hvm_init_shared_info();
 	xen_callback_vector();
@@ -37,6 +38,7 @@ void xen_hvm_post_suspend(int suspend_cancelled)
 			xen_setup_runstate_info(cpu);
 		}
 	}
+#endif
 }
 
 void xen_post_suspend(int suspend_cancelled)