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

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

ARM: SMP: move CPU number sanity checks to smp_init_cpus() 



Ensure that the number of CPUs is sanity checked before setting
the number of possible CPUs.  This avoids any chance of overflowing
the cpu_possible bitmap.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 28e18293

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

+11 −10
Original line number Diff line number Diff line
@@ -120,16 +120,6 @@ void __init smp_init_cpus(void) 


	ncores = get_core_count();



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

		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = get_core_count();

	unsigned int cpu = smp_processor_id();

	int i;



	/* sanity check */

	if (ncores == 0) {

		printk(KERN_ERR
@@ -144,6 +134,17 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
		       ncores, NR_CPUS);

		ncores = NR_CPUS;

	}



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

		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();

	unsigned int cpu = smp_processor_id();

	int i;



	smp_store_cpu_info(cpu);



	/*

arch/arm/mach-realview/platsmp.c

+10 −10
Original line number Diff line number Diff line
@@ -160,16 +160,6 @@ void __init smp_init_cpus(void) 
{

	unsigned int i, ncores = get_core_count();



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

		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = get_core_count();

	unsigned int cpu = smp_processor_id();

	int i;



	/* sanity check */

	if (ncores == 0) {

		printk(KERN_ERR
@@ -186,6 +176,16 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
		ncores = NR_CPUS;

	}



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

		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();

	unsigned int cpu = smp_processor_id();

	int i;



	smp_store_cpu_info(cpu);



	/*

arch/arm/mach-ux500/platsmp.c

+13 −13
Original line number Diff line number Diff line
@@ -128,16 +128,6 @@ void __init smp_init_cpus(void) 
{

	unsigned int i, ncores = get_core_count();



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

		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = get_core_count();

	unsigned int cpu = smp_processor_id();

	int i;



	/* sanity check */

	if (ncores == 0) {

		printk(KERN_ERR
@@ -145,14 +135,24 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
		ncores = 1;

	}



	if (ncores > num_possible_cpus())	{

	if (ncores > NR_CPUS) {

		printk(KERN_WARNING

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

		       "maximum of %d - clipping\n",

		       ncores, num_possible_cpus());

		ncores = num_possible_cpus();

		       ncores, NR_CPUS);

		ncores = NR_CPUS;

	}



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

		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();

	unsigned int cpu = smp_processor_id();

	int i;



	smp_store_cpu_info(cpu);



	/*