Commit c642af9c authored by Santosh Sivaraj's avatar Santosh Sivaraj Committed by Michael Ellerman
Browse files

powerpc/smp: Convert NR_CPUS to nr_cpu_ids 



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: default avatarSantosh Sivaraj <santosh@fossix.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f8d0d5dc

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*

arch/powerpc/platforms/cell/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

arch/powerpc/platforms/powernv/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*

arch/powerpc/platforms/pseries/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

CRA Git | Maintained and supported by SUSTech CRA and CCSE