Russell King - ARM Linux <[email protected]> writes:

> On Fri, Oct 07, 2011 at 03:31:26PM -0700, Kevin Hilman wrote:
>> Some platforms (e.g. OMAP) use the same common cpu_suspend/cpu_resume
>> helpers during idle as well as suspend.
>> 
>> Currently, if suspend is disabled (CONFIG_PM_SLEEP=n) and the platform
>> idle code is using the common cpu_suspend/cpu_resume functions, the
>> kernel will not link.
>> 
>> Since platform code commonly uses CONFIG_PM=y to build it's idle code,
>> build the common sleep/suspend code based on CONFIG_PM instead of
>> CONFIG_PM_SLEEP.
>> 
>> Signed-off-by: Kevin Hilman <[email protected]>
>> ---
>> Applies on Russell's devel-stable branch, where the new common
>> suspend/resume code is queued.
>
> See:
>
> commit 15e0d9e37c7fe9711b60f47221c394d45553ad8c
> Author: Arnd Bergmann <[email protected]>
> Date:   Sat Oct 1 21:09:39 2011 +0200
>
>     ARM: pm: let platforms select cpu_suspend support
>
>     Support for the cpu_suspend functions is only built-in
>     when CONFIG_PM_SLEEP is enabled, but omap3/4, exynos4
>     and pxa always call cpu_suspend when CONFIG_PM is enabled.
>
>     Signed-off-by: Arnd Bergmann <[email protected]>

Nice.  That will work too.

I see this in Arnd's randconfig/arm branch but not yet in
arm-soc/for-next.   Is this being queued for v3.2?

This will also conflict with your devel-stable where the suspend.c is
added.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to