Skip to content

Commit 7f3de1a

Browse files
xhackerustcpalmer-dabbelt
authored andcommitted
riscv: remove cpu_stop()
Except arch_cpu_idle_dead(), no users of this function. So remove cpu_stop() and fold its code into arch_cpu_idle_dead(). Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent decf89f commit 7f3de1a

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

arch/riscv/include/asm/smp.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ asmlinkage void smp_callin(void);
6363
#if defined CONFIG_HOTPLUG_CPU
6464
int __cpu_disable(void);
6565
void __cpu_die(unsigned int cpu);
66-
void cpu_stop(void);
67-
#else
6866
#endif /* CONFIG_HOTPLUG_CPU */
6967

7068
#else

arch/riscv/kernel/cpu-hotplug.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
#include <asm/cpu_ops.h>
1515
#include <asm/sbi.h>
1616

17-
void cpu_stop(void);
18-
void arch_cpu_idle_dead(void)
19-
{
20-
cpu_stop();
21-
}
22-
2317
bool cpu_has_hotplug(unsigned int cpu)
2418
{
2519
if (cpu_ops[cpu]->cpu_stop)
@@ -75,7 +69,7 @@ void __cpu_die(unsigned int cpu)
7569
/*
7670
* Called from the idle thread for the CPU which has been shutdown.
7771
*/
78-
void cpu_stop(void)
72+
void arch_cpu_idle_dead(void)
7973
{
8074
idle_task_exit();
8175

0 commit comments

Comments
 (0)