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

Commit 73e753a5 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

CPU HOTPLUG: avoid hotadd when proper possible_map isn't specified 



cpu-hot-add should be fail if cpu is not set in cpu_possible_map.  If go
ahead, the system will panic soon.

Especially, arch which requires additional_cpus= parameter should handle
this.  Tested on ia64.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 470fd646

kernel/cpu.c

+9 −0
Original line number Diff line number Diff line
@@ -265,6 +265,15 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen) 
int __cpuinit cpu_up(unsigned int cpu)

{

	int err = 0;

	if (!cpu_isset(cpu, cpu_possible_map)) {

		printk(KERN_ERR "can't online cpu %d because it is not "

			"configured as may-hotadd at boot time\n", cpu);

#if defined(CONFIG_IA64) || defined(CONFIG_X86_64) || defined(CONFIG_S390)

		printk(KERN_ERR "please check additional_cpus= boot "

				"parameter\n");

#endif

		return -EINVAL;

	}



	mutex_lock(&cpu_add_remove_lock);

	if (cpu_hotplug_disabled)