| Message ID | E1r0JLq-00CTxq-CF@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Initial cleanups for vCPU hotplug | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 11/7/23 18:30, Russell King (Oracle) wrote: > Convert arm64 to use the arch_cpu_is_hotpluggable() helper rather than > arch_register_cpu(). > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > --- > arch/arm64/kernel/setup.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 165bd2c0dd5a..42c690bb2d60 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -402,13 +402,9 @@ static inline bool cpu_can_disable(unsigned int cpu) > return false; > } > > -int arch_register_cpu(int num) > +bool arch_cpu_is_hotpluggable(int num) > { > - struct cpu *cpu = &per_cpu(cpu_devices, num); > - > - cpu->hotpluggable = cpu_can_disable(num); > - > - return register_cpu(cpu, num); > + return cpu_can_disable(num); > } > > static void dump_kernel_offset(void)
On 11/7/23 20:30, Russell King (Oracle) wrote: > Convert arm64 to use the arch_cpu_is_hotpluggable() helper rather than > arch_register_cpu(). > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > arch/arm64/kernel/setup.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > Reviewed-by: Gavin Shan <gshan@redhat.com>
On Tue, 07 Nov 2023 10:30:30 +0000 "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> wrote: > Convert arm64 to use the arch_cpu_is_hotpluggable() helper rather than > arch_register_cpu(). > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Ah. Or previous patch needs a forwards reference to the tweaking of it it here. Maybe just smash the 2 together with a Co-developed: ? I don't care that much so whatever works for you Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > arch/arm64/kernel/setup.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 165bd2c0dd5a..42c690bb2d60 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -402,13 +402,9 @@ static inline bool cpu_can_disable(unsigned int cpu) > return false; > } > > -int arch_register_cpu(int num) > +bool arch_cpu_is_hotpluggable(int num) > { > - struct cpu *cpu = &per_cpu(cpu_devices, num); > - > - cpu->hotpluggable = cpu_can_disable(num); > - > - return register_cpu(cpu, num); > + return cpu_can_disable(num); > } > > static void dump_kernel_offset(void)
On Tue, Nov 28, 2023 at 03:11:15PM +0000, Jonathan Cameron wrote: > On Tue, 07 Nov 2023 10:30:30 +0000 > "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> wrote: > > > Convert arm64 to use the arch_cpu_is_hotpluggable() helper rather than > > arch_register_cpu(). > > > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > Ah. Or previous patch needs a forwards reference to the tweaking > of it it here. > > Maybe just smash the 2 together with a Co-developed: ? I wanted to keep the two separate to preserve the authorship of the individual patches, so I'll take the former. Thanks.
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 165bd2c0dd5a..42c690bb2d60 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -402,13 +402,9 @@ static inline bool cpu_can_disable(unsigned int cpu) return false; } -int arch_register_cpu(int num) +bool arch_cpu_is_hotpluggable(int num) { - struct cpu *cpu = &per_cpu(cpu_devices, num); - - cpu->hotpluggable = cpu_can_disable(num); - - return register_cpu(cpu, num); + return cpu_can_disable(num); } static void dump_kernel_offset(void)
Convert arm64 to use the arch_cpu_is_hotpluggable() helper rather than arch_register_cpu(). Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- arch/arm64/kernel/setup.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)