git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
setup.c
diff --git
a/arch/x86/xen/setup.c
b/arch/x86/xen/setup.c
index
02ffd9e
..
df118a8
100644
(file)
--- a/
arch/x86/xen/setup.c
+++ b/
arch/x86/xen/setup.c
@@
-9,6
+9,7
@@
#include <linux/mm.h>
#include <linux/pm.h>
#include <linux/memblock.h>
#include <linux/mm.h>
#include <linux/pm.h>
#include <linux/memblock.h>
+#include <linux/cpuidle.h>
#include <asm/elf.h>
#include <asm/vdso.h>
#include <asm/elf.h>
#include <asm/vdso.h>
@@
-424,7
+425,7
@@
void __init xen_arch_setup(void)
#ifdef CONFIG_X86_32
boot_cpu_data.hlt_works_ok = 1;
#endif
#ifdef CONFIG_X86_32
boot_cpu_data.hlt_works_ok = 1;
#endif
-
pm_idle = default_idle
;
+
disable_cpuidle()
;
boot_option_idle_override = IDLE_HALT;
fiddle_vdso();
boot_option_idle_override = IDLE_HALT;
fiddle_vdso();