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

Commit a9fa06c2 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds
Browse files

[PATCH] set cpu_state for CPU hotplug (ia64) 



Dead CPU notifies online CPU that it's dead using cpu_state variable.
After switching to physical cpu hotplug, we forgot setting the variable.
This patch fixes it.  Currently only __cpu_die uses it.  We changed other
locations for consistency in case others use it.

Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Acked-by: default avatarAshok Raj <ashok.raj@intel.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a02c4cb6

arch/ia64/kernel/smpboot.c

+3 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ smp_callin (void) 
	lock_ipi_calllock();

	cpu_set(cpuid, cpu_online_map);

	unlock_ipi_calllock();

	per_cpu(cpu_state, cpuid) = CPU_ONLINE;



	smp_setup_percpu_timer();
@@ -611,6 +612,7 @@ void __devinit smp_prepare_boot_cpu(void) 
{

	cpu_set(smp_processor_id(), cpu_online_map);

	cpu_set(smp_processor_id(), cpu_callin_map);

	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;

}



/*
@@ -775,6 +777,7 @@ __cpu_up (unsigned int cpu) 
	if (cpu_isset(cpu, cpu_callin_map))

		return -EINVAL;



	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;

	/* Processor goes to start_secondary(), sets online flag */

	ret = do_boot_cpu(sapicid, cpu);

	if (ret < 0)