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

Commit 092c9488 authored by Ashok Raj's avatar Ashok Raj Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Don't call enforce_max_cpus when hotplug is enabled 



enforce_max_cpus nukes out cpu_present_map and cpu_possible_map making it
impossible to add new cpus in the system.  Since it doesnt provide any
additional value apart this call and reference is removed.

Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Acked-by: default avatarAndi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fdf26d93

arch/x86_64/kernel/smpboot.c

+0 −19
Original line number Diff line number Diff line
@@ -894,23 +894,6 @@ static __init void disable_smp(void) 
	cpu_set(0, cpu_core_map[0]);

}



/*

 * Handle user cpus=... parameter.

 */

static __init void enforce_max_cpus(unsigned max_cpus)

{

	int i, k;

	k = 0;

	for (i = 0; i < NR_CPUS; i++) {

		if (!cpu_possible(i))

			continue;

		if (++k > max_cpus) {

			cpu_clear(i, cpu_possible_map);

			cpu_clear(i, cpu_present_map);

		}

	}

}



#ifdef CONFIG_HOTPLUG_CPU

/*

 * cpu_possible_map should be static, it cannot change as cpu's
@@ -999,8 +982,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	current_cpu_data = boot_cpu_data;

	current_thread_info()->cpu = 0;  /* needed? */



	enforce_max_cpus(max_cpus);



#ifdef CONFIG_HOTPLUG_CPU

	prefill_possible_map();

#endif