]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cpuidle: Fix ARM_QCOM_SPM_CPUIDLE configuration
authorHe Ying <heying24@huawei.com>
Tue, 6 Apr 2021 12:33:28 +0000 (08:33 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:46 +0000 (10:49 +0200)
[ Upstream commit 498ba2a8a2756694b6f3888857426dbc8a5e6b6c ]

When CONFIG_ARM_QCOM_SPM_CPUIDLE is y and CONFIG_MMU is not set,
compiling errors are encountered as follows:

drivers/cpuidle/cpuidle-qcom-spm.o: In function `spm_dev_probe':
cpuidle-qcom-spm.c:(.text+0x140): undefined reference to `cpu_resume_arm'
cpuidle-qcom-spm.c:(.text+0x148): undefined reference to `cpu_resume_arm'

Note that cpu_resume_arm is defined when MMU is set. So, add dependency
on MMU in ARM_QCOM_SPM_CPUIDLE configuration.

Fixes: a871be6b8eee ("cpuidle: Convert Qualcomm SPM driver to a generic CPUidle driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: He Ying <heying24@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210406123328.92904-1-heying24@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cpuidle/Kconfig.arm

index 0844fadc4be85b6f1ca5655d0b87b94e9dad33e6..334f83e56120c0022311c9f3f11ecaad5d0e67d7 100644 (file)
@@ -107,7 +107,7 @@ config ARM_TEGRA_CPUIDLE
 
 config ARM_QCOM_SPM_CPUIDLE
        bool "CPU Idle Driver for Qualcomm Subsystem Power Manager (SPM)"
-       depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64
+       depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64 && MMU
        select ARM_CPU_SUSPEND
        select CPU_IDLE_MULTIPLE_DRIVERS
        select DT_IDLE_STATES