From bed15a0091826b405489b636d45544ecd2907e20 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Fri, 11 Feb 2011 17:55:13 +0000
Subject: [PATCH] --- yaml --- r: 234223 b: refs/heads/master c:
 e057a4b6e0eb6701f6ec923be2075d4984cef51a h: refs/heads/master i:   234221:
 a8fa922a445968f7190e7d53670a3e478cdfbd23   234219:
 b0bc7f762f3c4d35ae180a1bc078c175823beaa6   234215:
 abae0a699bc06ead421ca1cbdf41b24182b42864   234207:
 560a3a463c852b3851354b4aa13e96552909099d v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/xen/suspend.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0356472f6a3d..fbe605c24c28 100644
--- 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
index 9bbd63a129b5..4a3d3dd3dd30 100644
--- 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)