openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86, uv: Remove recursion in uv_heartbeat_enable() 

The recursion is not needed and does not improve readability.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
LKML-Reference: <4B45F13E.3040202@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Roel Kluin 2010-01-07 15:35:42 +01:00 committed by H. Peter Anvin
parent e1e0138d7d
commit 99659a929d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/apic/x2apic_uv_x.c
View File

@ -475,7 +475,7 @@ static void uv_heartbeat(unsigned long ignored)
static void __cpuinit uv_heartbeat_enable(int cpu)
{
if (!uv_cpu_hub_info(cpu)->scir.enabled) {
while (!uv_cpu_hub_info(cpu)->scir.enabled) {
struct timer_list *timer = &uv_cpu_hub_info(cpu)->scir.timer;
uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY);
@ -483,11 +483,10 @@ static void __cpuinit uv_heartbeat_enable(int cpu)
timer->expires = jiffies + SCIR_CPU_HB_INTERVAL;
add_timer_on(timer, cpu);
uv_cpu_hub_info(cpu)->scir.enabled = 1;
}
/* check boot cpu */
if (!uv_cpu_hub_info(0)->scir.enabled)
uv_heartbeat_enable(0);
/* also ensure that boot cpu is enabled */
cpu = 0;
}
}
#ifdef CONFIG_HOTPLUG_CPU