From caf21d81e4cd3284895525db6c6d437c8ce20270 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 13 Mar 2012 20:06:57 -0400
Subject: [PATCH] --- yaml --- r: 295494 b: refs/heads/master c:
 48cdd8287f47a3cdad5b9273a5ef81bf605f7826 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 84068b2dc041..ea5f299a5760 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 448c8b1d07d5342922567e138a4b0108a42c24fb
+refs/heads/master: 48cdd8287f47a3cdad5b9273a5ef81bf605f7826
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
index 12366238d07d..1ba8dff26753 100644
--- a/trunk/arch/x86/xen/setup.c
+++ b/trunk/arch/x86/xen/setup.c
@@ -10,6 +10,7 @@
 #include <linux/pm.h>
 #include <linux/memblock.h>
 #include <linux/cpuidle.h>
+#include <linux/cpufreq.h>
 
 #include <asm/elf.h>
 #include <asm/vdso.h>
@@ -420,6 +421,7 @@ void __init xen_arch_setup(void)
 	boot_cpu_data.hlt_works_ok = 1;
 #endif
 	disable_cpuidle();
+	disable_cpufreq();
 	WARN_ON(set_pm_idle_to_default());
 	fiddle_vdso();
 }