[PATCH] ARM: PM: build sleep/suspend code for idle path also (not only suspend)

[PATCH] ARM: PM: build sleep/suspend code for idle path also (not only suspend)

[Kevin Hilman]

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 <khilman@ti.com>
---
Applies on Russell's devel-stable branch, where the new common
suspend/resume code is queued.

 arch/arm/kernel/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 8fa83f5..25d3a0c 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_MODULES)		+= armksyms.o module.o
 obj-$(CONFIG_ARTHUR)		+= arthur.o
 obj-$(CONFIG_ISA_DMA)		+= dma-isa.o
 obj-$(CONFIG_PCI)		+= bios32.o isa.o
-obj-$(CONFIG_PM_SLEEP)		+= sleep.o suspend.o
+obj-$(CONFIG_PM)		+= sleep.o suspend.o
 obj-$(CONFIG_HAVE_SCHED_CLOCK)	+= sched_clock.o
 obj-$(CONFIG_SMP)		+= smp.o smp_tlb.o
 obj-$(CONFIG_HAVE_ARM_SCU)	+= smp_scu.o
-- 
1.7.6

[PATCH] ARM: PM: build sleep/suspend code for idle path also (not only suspend)

[Russell King - ARM Linux]

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 <khilman@ti.com>
> ---
> Applies on Russell's devel-stable branch, where the new common
> suspend/resume code is queued.

See:

commit 15e0d9e37c7fe9711b60f47221c394d45553ad8c
Author: Arnd Bergmann <arnd@arndb.de>
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 <arnd@arndb.de>

[PATCH] ARM: PM: build sleep/suspend code for idle path also (not only suspend)

[Kevin Hilman]

Russell King - ARM Linux <linux@arm.linux.org.uk> 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 <khilman@ti.com>
>> ---
>> Applies on Russell's devel-stable branch, where the new common
>> suspend/resume code is queued.
>
> See:
>
> commit 15e0d9e37c7fe9711b60f47221c394d45553ad8c
> Author: Arnd Bergmann <arnd@arndb.de>
> 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 <arnd@arndb.de>

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

[PATCH] ARM: PM: build sleep/suspend code for idle path also (not only suspend)

[Russell King - ARM Linux]

On Fri, Oct 07, 2011 at 03:49:37PM -0700, Kevin Hilman wrote:
> I see this in Arnd's randconfig/arm branch but not yet in
> arm-soc/for-next.   Is this being queued for v3.2?

Yes.

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

Already sorted.