[tip:x86/uv] x86, uv: Remove recursion in uv_heartbeat_enable()
in [Kernel]
|
Prev: [tip:x86/uv] x86, uv: uv_global_gru_mmr_address() macro fix
Next: [PATCH 2/6] list: Introduce list_rotate_left()
From: tip-bot for Roel Kluin on 9 Jan 2010 17:50 Commit-ID: 99659a929d653d0c9ce458091870544768add871 Gitweb: http://git.kernel.org/tip/99659a929d653d0c9ce458091870544768add871 Author: Roel Kluin <roel.kluin(a)gmail.com> AuthorDate: Thu, 7 Jan 2010 15:35:42 +0100 Committer: H. Peter Anvin <hpa(a)zytor.com> CommitDate: Thu, 7 Jan 2010 11:50:06 -0800 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(a)gmail.com> LKML-Reference: <4B45F13E.3040202(a)gmail.com> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> --- arch/x86/kernel/apic/x2apic_uv_x.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index af5d103..d199dc3 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |