[PATCH 1/8] x86: avoid check hlt if no timer interrupts
in [Kernel]
|
Prev: [PATCH 5/8] x86/apbt: support more timer configurations on mrst
Next: [PATCH 2/8] x86/mrst/pci: return 0 for non-present pci bars
From: Jacob Pan on 7 May 2010 13:50 From: Jacob Pan <jacob.jun.pan(a)intel.com> check hlt requires external timer interrupt to wake up the cpu. for platforms equipped with only per cpu timers, we don't have external interrupts during check hlt. this patch checks such condition to avoid kernel hang at hlt. it also saves boot time in that hlt four times in the current code requires four ticks to break out of them. Signed-off-by: Jacob Pan <jacob.jun.pan(a)intel.com> Signed-off-by: Jacob Pan <jacob.jun.pan(a)linux.intel.com> --- arch/x86/include/asm/bugs.h | 1 + arch/x86/kernel/cpu/bugs.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/bugs.h b/arch/x86/include/asm/bugs.h index 08abf63..1e0cef8 100644 --- a/arch/x86/include/asm/bugs.h +++ b/arch/x86/include/asm/bugs.h @@ -2,6 +2,7 @@ #define _ASM_X86_BUGS_H extern void check_bugs(void); +extern struct clock_event_device *global_clock_event; #if defined(CONFIG_CPU_SUP_INTEL) && defined(CONFIG_X86_32) int ppro_with_ram_bug(void); diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 01a2652..c0d9688 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -90,6 +90,10 @@ static void __init check_hlt(void) return; printk(KERN_INFO "Checking 'hlt' instruction... "); + if (!global_clock_event) { + printk(KERN_CONT "no clockevent to wake up, skipped.\n"); + return; + } if (!boot_cpu_data.hlt_works_ok) { printk("disabled\n"); return; -- 1.6.3.3 -- 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/ |