[PATCH] ARM: mach-omap2: Kconfig: select SUSPEND and PM_SLEEP if PM for omap3

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



It's conceivable to configure a kernel with CONFIG_PM, but without
CONFIG_PM_SLEEP.

- If CONFIG_PM is defined, pm34xx.c calls cpu_suspend() in line 430.
- cpu_suspend() is a static inline defined in asm/suspend.h, calling
__cpu_suspend() to do the real job.
- But __cpu_suspend (in kernel/sleep.S) is only linked in if
CONFIG_PM_SLEEP is defined.

The result is a link error:
arch/arm/mach-omap2/built-in.o: In function `cpu_suspend':
arch/arm/include/asm/suspend.h:17: undefined reference to `__cpu_suspend'

There is a similar dependency error with a call to cpu_resume() in
sleep34xx.S, line 534.

Since the code obviously assumes that PM_SLEEP should be defined if
PM, change the omap2 Kconfig
to reflect this.  The existing selection of PM_OPP if PM serves as a
precedent for this solution.

When selecting PM_SLEEP, also select SUSPEND, which PM_SLEEP depends on.

Signed-off-by: Bjarne Steinsbo <bsteinsbo@xxxxxxxxx>
---
 arch/arm/mach-omap2/Kconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 57b66d5..04a3a83 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -36,6 +36,8 @@ config ARCH_OMAP3
 	select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4
 	select ARCH_HAS_OPP
 	select PM_OPP if PM
+	select SUSPEND if PM
+	select PM_SLEEP if PM

 config ARCH_OMAP4
 	bool "TI OMAP4"
-- 
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux