2011-06-10 03:44:08

by Ben Hutchings

Subject: [PATCH] x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) if CONFIG_APM_MODULE (only)

Commit 06ae40ce073daf233607a3c54a489f2c1e44683e ('x86 idle:
EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it') made
these exports dependent on CONFIG_APM_MODULE && CONFIG_APM_CPU_IDLE.
However, the apm module always needs these symbols.
CONFIG_APM_CPU_IDLE only controls whether it installs its CPU idle
handler by default.

Signed-off-by: Ben Hutchings <[email protected]>
---
This fixes a regression in 3.0-rc1 and should be applied in this cycle.

Ben.

arch/x86/kernel/process.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 2e4928d..e1ba8cb 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -337,7 +337,7 @@ EXPORT_SYMBOL(boot_option_idle_override);
* Powermanagement idle function, if any..
*/
void (*pm_idle)(void);
-#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
+#ifdef CONFIG_APM_MODULE
EXPORT_SYMBOL(pm_idle);
#endif

@@ -399,7 +399,7 @@ void default_idle(void)
cpu_relax();
}
}
-#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
+#ifdef CONFIG_APM_MODULE
EXPORT_SYMBOL(default_idle);
#endif

--
1.7.5.3

2011-06-10 06:38:13

by Randy Dunlap

Subject: Re: [PATCH] x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) if CONFIG_APM_MODULE (only)

On Fri, 10 Jun 2011 04:43:56 +0100 Ben Hutchings wrote:

> Commit 06ae40ce073daf233607a3c54a489f2c1e44683e ('x86 idle:
> EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it') made
> these exports dependent on CONFIG_APM_MODULE && CONFIG_APM_CPU_IDLE.
> However, the apm module always needs these symbols.
> CONFIG_APM_CPU_IDLE only controls whether it installs its CPU idle
> handler by default.

also fixed here: https://lkml.org/lkml/2011/6/8/170

but yes, someone please get it merged.

> Signed-off-by: Ben Hutchings <[email protected]>
> ---
> This fixes a regression in 3.0-rc1 and should be applied in this cycle.
>
> Ben.
>
> arch/x86/kernel/process.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
> index 2e4928d..e1ba8cb 100644
> --- a/arch/x86/kernel/process.c
> +++ b/arch/x86/kernel/process.c
> @@ -337,7 +337,7 @@ EXPORT_SYMBOL(boot_option_idle_override);
> * Powermanagement idle function, if any..
> */
> void (*pm_idle)(void);
> -#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
> +#ifdef CONFIG_APM_MODULE
> EXPORT_SYMBOL(pm_idle);
> #endif
>
> @@ -399,7 +399,7 @@ void default_idle(void)
> cpu_relax();
> }
> }
> -#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
> +#ifdef CONFIG_APM_MODULE
> EXPORT_SYMBOL(default_idle);
> #endif
>
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***