diff options
author | Len Brown <len.brown@intel.com> | 2013-02-09 23:08:07 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2013-02-10 01:06:34 -0500 |
commit | 6a377ddc4e4ede2eeb9cd46ada23bbe417704fc9 (patch) | |
tree | 6e97b12ef974ea03d22ea05a92824293c3eeca0b | |
parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) |
xen idle: make xen-specific macro xen-specific
This macro is only invoked by Xen,
so make its definition specific to Xen.
> set_pm_idle_to_default()
< xen_set_default_idle()
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: xen-devel@lists.xensource.com
-rw-r--r-- | arch/x86/include/asm/processor.h | 6 | ||||
-rw-r--r-- | arch/x86/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/x86/xen/setup.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 888184b2fc85..c2f7f472275e 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
@@ -998,7 +998,11 @@ extern unsigned long arch_align_stack(unsigned long sp); | |||
998 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); | 998 | extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |
999 | 999 | ||
1000 | void default_idle(void); | 1000 | void default_idle(void); |
1001 | bool set_pm_idle_to_default(void); | 1001 | #ifdef CONFIG_XEN |
1002 | bool xen_set_default_idle(void); | ||
1003 | #else | ||
1004 | #define xen_set_default_idle 0 | ||
1005 | #endif | ||
1002 | 1006 | ||
1003 | void stop_this_cpu(void *dummy); | 1007 | void stop_this_cpu(void *dummy); |
1004 | 1008 | ||
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 2ed787f15bf0..7ed9f6b08ba0 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -396,7 +396,8 @@ void default_idle(void) | |||
396 | EXPORT_SYMBOL(default_idle); | 396 | EXPORT_SYMBOL(default_idle); |
397 | #endif | 397 | #endif |
398 | 398 | ||
399 | bool set_pm_idle_to_default(void) | 399 | #ifdef CONFIG_XEN |
400 | bool xen_set_default_idle(void) | ||
400 | { | 401 | { |
401 | bool ret = !!pm_idle; | 402 | bool ret = !!pm_idle; |
402 | 403 | ||
@@ -404,6 +405,7 @@ bool set_pm_idle_to_default(void) | |||
404 | 405 | ||
405 | return ret; | 406 | return ret; |
406 | } | 407 | } |
408 | #endif | ||
407 | void stop_this_cpu(void *dummy) | 409 | void stop_this_cpu(void *dummy) |
408 | { | 410 | { |
409 | local_irq_disable(); | 411 | local_irq_disable(); |
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 8971a26d21ab..2b73b5c8555f 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
@@ -561,7 +561,7 @@ void __init xen_arch_setup(void) | |||
561 | #endif | 561 | #endif |
562 | disable_cpuidle(); | 562 | disable_cpuidle(); |
563 | disable_cpufreq(); | 563 | disable_cpufreq(); |
564 | WARN_ON(set_pm_idle_to_default()); | 564 | WARN_ON(xen_set_default_idle()); |
565 | fiddle_vdso(); | 565 | fiddle_vdso(); |
566 | #ifdef CONFIG_NUMA | 566 | #ifdef CONFIG_NUMA |
567 | numa_off = 1; | 567 | numa_off = 1; |