iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/smp: Convert NR_CPUS to nr_cpu_ids

Browse Source 
nr_cpu_ids can be limited by nr_cpus boot parameter, whereas NR_CPUS is a
compile time constant, which shouldn't be compared against during cpu kick.

Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Santosh Sivaraj 2017-06-27 12:30:06 +05:30 committed by Michael Ellerman
parent f8d0d5dc64
commit c642af9c41
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/smp.c
View File

@ -112,7 +112,7 @@ int smp_generic_cpu_bootable(unsigned int nr)
#ifdef CONFIG_PPC64
int smp_generic_kick_cpu(int nr)
{
if (nr < 0 || nr >= NR_CPUS)
if (nr < 0 || nr >= nr_cpu_ids)
return -EINVAL;
/*

2
arch/powerpc/platforms/cell/smp.c
View File

@ -115,7 +115,7 @@ static void smp_cell_setup_cpu(int cpu)
static int smp_cell_kick_cpu(int nr)
{
if (nr < 0 || nr >= NR_CPUS)
if (nr < 0 || nr >= nr_cpu_ids)
return -EINVAL;
if (!smp_startup_cpu(nr))

2
arch/powerpc/platforms/powernv/smp.c
View File

@ -63,7 +63,7 @@ static int pnv_smp_kick_cpu(int nr)
long rc;
uint8_t status;
if (nr < 0 || nr >= NR_CPUS)
if (nr < 0 || nr >= nr_cpu_ids)
return -EINVAL;
/*

2
arch/powerpc/platforms/pseries/smp.c
View File

@ -151,7 +151,7 @@ static void smp_setup_cpu(int cpu)
static int smp_pSeries_kick_cpu(int nr)
{
if (nr < 0 || nr >= NR_CPUS)
if (nr < 0 || nr >= nr_cpu_ids)
return -EINVAL;
if (!smp_startup_cpu(nr))