File xen3-patch-3.1 of Package drm

From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Linux: 3.1
Patch-mainline: 3.1

 This patch contains the differences between 3.0 and 3.1.

Automatically created from "patch-3.1" by xen-port-patches.py
Acked-by: jbeulich@suse.com

3.4/arch/x86/vdso/vclock_gettime.c (done differently)

---
 drivers/gpu/drm/i915/intel_pm.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3727,7 +3727,11 @@ static void __gen6_update_ring_freq(stru
 		 * Default to measured freq if none found, PCU will ensure we
 		 * don't go over
 		 */
+#ifndef CONFIG_XEN
 		max_ia_freq = tsc_khz;
+#else
+		max_ia_freq = cpu_khz;
+#endif
 	}
 
 	/* Convert from kHz to MHz */