| Message ID | 20200918153548.836986-1-sergey.senozhatsky@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: ipi_teardown() should depend on HOTPLUG_CPU | expand |
On Sat, Sep 19, 2020 at 12:35:48AM +0900, Sergey Senozhatsky wrote: > ipi_teardown() is used only when CONFIG_HOTPLUG_CPU is set. > > Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> > --- > arch/arm64/kernel/smp.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) I think this is a duplicate of: https://lore.kernel.org/r/20200918123318.23764-1-yuehaibing@huawei.com which Marc is aware of (and I'm assuming he'll fix it in his series). Will
On 2020-09-18 16:41, Will Deacon wrote: > On Sat, Sep 19, 2020 at 12:35:48AM +0900, Sergey Senozhatsky wrote: >> ipi_teardown() is used only when CONFIG_HOTPLUG_CPU is set. >> >> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> >> --- >> arch/arm64/kernel/smp.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) > > I think this is a duplicate of: > > > https://lore.kernel.org/r/20200918123318.23764-1-yuehaibing@huawei.com > > which Marc is aware of (and I'm assuming he'll fix it in his series). Indeed. Applied and pushed out. Thanks though! M. (about to fix the same issue with arch/arm...)
On (20/09/18 17:07), Marc Zyngier wrote: > On 2020-09-18 16:41, Will Deacon wrote: > > On Sat, Sep 19, 2020 at 12:35:48AM +0900, Sergey Senozhatsky wrote: > > > ipi_teardown() is used only when CONFIG_HOTPLUG_CPU is set. > > > > > > Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> > > > --- > > > arch/arm64/kernel/smp.c | 4 +++- > > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > I think this is a duplicate of: > > > > https://lore.kernel.org/r/20200918123318.23764-1-yuehaibing@huawei.com > > > > which Marc is aware of (and I'm assuming he'll fix it in his series). > > Indeed. Applied and pushed out. Thanks though! Oh, cool. Thanks. -ss
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index b6bde2675ccc..82e75fc2c903 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -82,9 +82,9 @@ static int nr_ipi __read_mostly = NR_IPI; static struct irq_desc *ipi_desc[NR_IPI] __read_mostly; static void ipi_setup(int cpu); -static void ipi_teardown(int cpu); #ifdef CONFIG_HOTPLUG_CPU +static void ipi_teardown(int cpu); static int op_cpu_kill(unsigned int cpu); #else static inline int op_cpu_kill(unsigned int cpu) @@ -964,6 +964,7 @@ static void ipi_setup(int cpu) enable_percpu_irq(ipi_irq_base + i, 0); } +#ifdef CONFIG_HOTPLUG_CPU static void ipi_teardown(int cpu) { int i; @@ -974,6 +975,7 @@ static void ipi_teardown(int cpu) for (i = 0; i < nr_ipi; i++) disable_percpu_irq(ipi_irq_base + i); } +#endif void __init set_smp_ipi_range(int ipi_base, int n) {
ipi_teardown() is used only when CONFIG_HOTPLUG_CPU is set. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> --- arch/arm64/kernel/smp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)