2021-03-21 22:03:40

by Necip Fazil Yildiran

[permalink] [raw]
Subject: [PATCH] PM: Kconfig: fix unmet dependency for PM_SLEEP_SMP

When PM_SLEEP_SMP is enabled and HOTPLUG_CPU is disabled, it results in the
following Kbuild warning:

WARNING: unmet direct dependencies detected for HOTPLUG_CPU
Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n])
Selected by [y]:
- PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=n] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y]

The reason is that PM_SLEEP_SMP selects HOTPLUG_CPU without depending on or
selecting HOTPLUG_CPU's dependencies.

Let PM_SLEEP_SMP depend on HOTPLUG_CPU instead to avoid Kbuild issues.

Signed-off-by: Necip Fazil Yildiran <[email protected]>
---
kernel/power/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 6bfe3ead10ad..8b53c9b61347 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -125,7 +125,7 @@ config PM_SLEEP_SMP
depends on SMP
depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP
- select HOTPLUG_CPU
+ depends on HOTPLUG_CPU

config PM_SLEEP_SMP_NONZERO_CPU
def_bool y
--
2.25.1


2021-03-22 13:34:32

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH] PM: Kconfig: fix unmet dependency for PM_SLEEP_SMP

On Sun, Mar 21, 2021 at 9:20 PM Necip Fazil Yildiran
<[email protected]> wrote:
>
> When PM_SLEEP_SMP is enabled and HOTPLUG_CPU is disabled, it results in the
> following Kbuild warning:
>
> WARNING: unmet direct dependencies detected for HOTPLUG_CPU
> Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n])
> Selected by [y]:
> - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=n] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y]
>
> The reason is that PM_SLEEP_SMP selects HOTPLUG_CPU without depending on or
> selecting HOTPLUG_CPU's dependencies.

This needs to be fixed.

HOTPLUG_CPU needs to be selected automatically by PM_SLEEP_SMP as it is now.

> Let PM_SLEEP_SMP depend on HOTPLUG_CPU instead to avoid Kbuild issues.
>
> Signed-off-by: Necip Fazil Yildiran <[email protected]>
> ---
> kernel/power/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
> index 6bfe3ead10ad..8b53c9b61347 100644
> --- a/kernel/power/Kconfig
> +++ b/kernel/power/Kconfig
> @@ -125,7 +125,7 @@ config PM_SLEEP_SMP
> depends on SMP
> depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
> depends on PM_SLEEP
> - select HOTPLUG_CPU
> + depends on HOTPLUG_CPU
>
> config PM_SLEEP_SMP_NONZERO_CPU
> def_bool y
> --
> 2.25.1
>