From 207d1885f6d75d35df7349a1c9e0d44a41d2d9a2 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 13 Dec 2011 12:34:15 -0500 Subject: [PATCH] Revert "xen/pm_idle: Make pm_idle be default_idle under Xen." as it is already such in kernels that are 3.0 or earlier. This reverts commit 9964aedb7350736b1f7a799d57ee92bbf4b99ea6. --- arch/x86/include/asm/system.h | 1 - arch/x86/kernel/process.c | 8 -------- arch/x86/xen/setup.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h index 2d2f01ce6dcb..c2ff2a1d845e 100644 --- a/arch/x86/include/asm/system.h +++ b/arch/x86/include/asm/system.h @@ -401,7 +401,6 @@ extern unsigned long arch_align_stack(unsigned long sp); extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -bool set_pm_idle_to_default(void); void stop_this_cpu(void *dummy); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 804d6ff2009b..e1ba8cb24e4e 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -403,14 +403,6 @@ void default_idle(void) EXPORT_SYMBOL(default_idle); #endif -bool set_pm_idle_to_default(void) -{ - bool ret = !!pm_idle; - - pm_idle = default_idle; - - return ret; -} void stop_this_cpu(void *dummy) { local_irq_disable(); diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 08178e03386c..60aeeb56948f 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -428,6 +428,6 @@ void __init xen_arch_setup(void) #endif pm_idle = default_idle; boot_option_idle_override = IDLE_HALT; - WARN_ON(set_pm_idle_to_default()); + fiddle_vdso(); } -- 2.50.1