Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a06f916b authored by Russell King's avatar Russell King
Browse files

ARM: smp: fix clipping of number of CPUs 



Rather than clipping the number of CPUs using the compile-time NR_CPUS
constant, use the runtime nr_cpu_ids value instead.  This allows the
nr_cpus command line option to work as expected.

Cc: <stable@kernel.org>
Reported-by: default avatarMark Salter <msalter@redhat.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5a567d78

arch/arm/mach-exynos4/platsmp.c

+4 −6
Original line number Diff line number Diff line
@@ -191,12 +191,10 @@ void __init smp_init_cpus(void) 
	ncores = scu_base ? scu_get_core_count(scu_base) : 1;



	/* sanity check */

	if (ncores > NR_CPUS) {

		printk(KERN_WARNING

		       "EXYNOS4: no. of cores (%d) greater than configured "

		       "maximum of %d - clipping\n",

		       ncores, NR_CPUS);

		ncores = NR_CPUS;

	if (ncores > nr_cpu_ids) {

		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",

			ncores, nr_cpu_ids);

		ncores = nr_cpu_ids;

	}



	for (i = 0; i < ncores; i++)

arch/arm/mach-msm/platsmp.c

+6 −0
Original line number Diff line number Diff line
@@ -156,6 +156,12 @@ void __init smp_init_cpus(void) 
{

	unsigned int i, ncores = get_core_count();



	if (ncores > nr_cpu_ids) {

		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",

			ncores, nr_cpu_ids);

		ncores = nr_cpu_ids;

	}



	for (i = 0; i < ncores; i++)

		set_cpu_possible(i, true);

arch/arm/mach-omap2/omap-smp.c

+4 −6
Original line number Diff line number Diff line
@@ -109,12 +109,10 @@ void __init smp_init_cpus(void) 
	ncores = scu_get_core_count(scu_base);



	/* sanity check */

	if (ncores > NR_CPUS) {

		printk(KERN_WARNING

		       "OMAP4: no. of cores (%d) greater than configured "

		       "maximum of %d - clipping\n",

		       ncores, NR_CPUS);

		ncores = NR_CPUS;

	if (ncores > nr_cpu_ids) {

		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",

			ncores, nr_cpu_ids);

		ncores = nr_cpu_ids;

	}



	for (i = 0; i < ncores; i++)

arch/arm/mach-realview/platsmp.c

+4 −6
Original line number Diff line number Diff line
@@ -52,12 +52,10 @@ void __init smp_init_cpus(void) 
	ncores = scu_base ? scu_get_core_count(scu_base) : 1;



	/* sanity check */

	if (ncores > NR_CPUS) {

		printk(KERN_WARNING

		       "Realview: no. of cores (%d) greater than configured "

		       "maximum of %d - clipping\n",

		       ncores, NR_CPUS);

		ncores = NR_CPUS;

	if (ncores > nr_cpu_ids) {

		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",

			ncores, nr_cpu_ids);

		ncores = nr_cpu_ids;

	}



	for (i = 0; i < ncores; i++)

arch/arm/mach-shmobile/platsmp.c

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ void __init smp_init_cpus(void) 
	unsigned int ncores = shmobile_smp_get_core_count();

	unsigned int i;



	if (ncores > nr_cpu_ids) {

		pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",

			ncores, nr_cpu_ids);

		ncores = nr_cpu_ids;

	}



	for (i = 0; i < ncores; i++)

		set_cpu_possible(i, true);