cpuidle: replace xen access to x86 pm_idle and default_idle
When a Xen Dom0 kernel boots on a hypervisor, it gets access to the raw-hardware ACPI tables. While it parses the idle tables for the hypervisor's beneift, it uses HLT for its own idle. Rather than have xen scribble on pm_idle and access default_idle, have it simply disable_cpuidle() so acpi_idle will not load and architecture default HLT will be used. cc: xen-devel@lists.xensource.com Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Acked-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
62027aea23
commit
d91ee5863b
|
@ -9,6 +9,7 @@
|
|||
#include <linux/mm.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/memblock.h>
|
||||
#include <linux/cpuidle.h>
|
||||
|
||||
#include <asm/elf.h>
|
||||
#include <asm/vdso.h>
|
||||
|
@ -426,7 +427,7 @@ void __init xen_arch_setup(void)
|
|||
#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();
|
||||
|
|
|
@ -34,6 +34,10 @@ int cpuidle_disabled(void)
|
|||
{
|
||||
return off;
|
||||
}
|
||||
void disable_cpuidle(void)
|
||||
{
|
||||
off = 1;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ARCH_HAS_CPU_IDLE_WAIT)
|
||||
static void cpuidle_kick_cpus(void)
|
||||
|
|
|
@ -122,6 +122,7 @@ struct cpuidle_driver {
|
|||
};
|
||||
|
||||
#ifdef CONFIG_CPU_IDLE
|
||||
extern void disable_cpuidle(void);
|
||||
|
||||
extern int cpuidle_register_driver(struct cpuidle_driver *drv);
|
||||
struct cpuidle_driver *cpuidle_get_driver(void);
|
||||
|
@ -135,6 +136,7 @@ extern int cpuidle_enable_device(struct cpuidle_device *dev);
|
|||
extern void cpuidle_disable_device(struct cpuidle_device *dev);
|
||||
|
||||
#else
|
||||
static inline void disable_cpuidle(void) { }
|
||||
|
||||
static inline int cpuidle_register_driver(struct cpuidle_driver *drv)
|
||||
{return -ENODEV; }
|
||||
|
|
Loading…
Reference in a new issue