ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
authorAhmad Fatoum <a.fatoum@pengutronix.de>
Mon, 23 Mar 2020 08:19:33 +0000 (09:19 +0100)
committerShawn Guo <shawnguo@kernel.org>
Tue, 21 Apr 2020 03:21:00 +0000 (11:21 +0800)
commit3100423dc133c25679dbaa1099404651b8ae3af9
treeaa0cb151a40f0c75da6f807794eea048abc3331b
parentcbe63a8358310244e6007398bd2c7c70c7fd51cd
ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y

512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally")
introduced an unintended linker error for i.MX6 configurations that have
ARM_CPU_SUSPEND=n which can happen if neither CONFIG_PM, CONFIG_CPU_IDLE,
nor ARM_PSCI_FW are selected.

Fix this by having v7_cpu_resume() compiled only when cpu_resume() it
calls is available as well.

The C declaration for the function remains unguarded to avoid future code
inadvertently using a stub and introducing a regression to the bug the
original commit fixed.

Cc: <stable@vger.kernel.org>
Fixes: 512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally")
Reported-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/mach-imx/Makefile