| From d3b3c637e4eb8d3bbe53e5692aee66add72f9851 Mon Sep 17 00:00:00 2001 |
| From: Helge Deller <deller@gmx.de> |
| Date: Tue, 19 Sep 2023 15:26:35 +0200 |
| Subject: parisc: Fix crash with nr_cpus=1 option |
| |
| From: Helge Deller <deller@gmx.de> |
| |
| commit d3b3c637e4eb8d3bbe53e5692aee66add72f9851 upstream. |
| |
| John David Anglin reported that giving "nr_cpus=1" on the command |
| line causes a crash, while "maxcpus=1" works. |
| |
| Reported-by: John David Anglin <dave.anglin@bell.net> |
| Signed-off-by: Helge Deller <deller@gmx.de> |
| Cc: stable@vger.kernel.org # v5.18+ |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/parisc/kernel/smp.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/arch/parisc/kernel/smp.c |
| +++ b/arch/parisc/kernel/smp.c |
| @@ -440,7 +440,9 @@ int __cpu_up(unsigned int cpu, struct ta |
| if (cpu_online(cpu)) |
| return 0; |
| |
| - if (num_online_cpus() < setup_max_cpus && smp_boot_one_cpu(cpu, tidle)) |
| + if (num_online_cpus() < nr_cpu_ids && |
| + num_online_cpus() < setup_max_cpus && |
| + smp_boot_one_cpu(cpu, tidle)) |
| return -EIO; |
| |
| return cpu_online(cpu) ? 0 : -EIO; |
