Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/power/reset/sc27xx-poweroff.c: In function 'sc27xx_poweroff_shutdown':
drivers/power/reset/sc27xx-poweroff.c:38:4: error: implicit declaration of function 'cpu_down' [-Werror=implicit-function-declaration]
38 | cpu_down(cpu);
| ^~~~~~~~
Caused by commit
33c3736ec888 ("cpu/hotplug: Hide cpu_up/down()")
interacting with commit
274afbc3ad33 ("power: reset: sc27xx: Change to use cpu_down()")
from the battery tree.
I have added the following merge fix patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 26 Mar 2020 13:42:00 +1100
Subject: [PATCH] power: reset: sc27xx: use remove_cpu instead of cpu_down
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/power/reset/sc27xx-poweroff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/reset/sc27xx-poweroff.c b/drivers/power/reset/sc27xx-poweroff.c
index 69863074daf6..90287c31992c 100644
--- a/drivers/power/reset/sc27xx-poweroff.c
+++ b/drivers/power/reset/sc27xx-poweroff.c
@@ -35,7 +35,7 @@ static void sc27xx_poweroff_shutdown(void)
for_each_online_cpu(cpu) {
if (cpu != smp_processor_id())
- cpu_down(cpu);
+ remove_cpu(cpu);
}
#endif
}
--
2.25.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpMBPTrJVhyn.pgp
Description: OpenPGP digital signature
