---

yaml --- r: 295494 b: refs/heads/master c: 48cdd82 h: refs/heads/master v: v3
git-mirror · Mar 20, 2012 · caf21d8 · caf21d8
1 parent d1fdb4d
commit caf21d8
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: 448c8b1d07d5342922567e138a4b0108a42c24fb
+refs/heads/master: 48cdd8287f47a3cdad5b9273a5ef81bf605f7826
diff --git 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();
 }