diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2023-10-09 18:09:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2023-10-09 18:09:23 +0200 |
| commit | fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3 (patch) | |
| tree | 9af7010f5f93005adbf6f98c6557552b86d32697 /arch/parisc/kernel | |
| parent | locking/seqlock: Fix typo in comment (diff) | |
| parent | Linux 6.6-rc5 (diff) | |
| download | linux-fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3.tar.gz linux-fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3.tar.bz2 linux-fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3.zip | |
Merge tag 'v6.6-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/smp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 4098f9a0964b..2019c1f04bd0 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c @@ -440,7 +440,9 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) 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; |