When using the APIC main timer option on x86_64, sometimes it
fails to complete its setup. Warn about this and suggest
the user try 'disable_timer_pin_1' if their system clock runs
too fast. Also, make printing of the exact result of APIC
timer calibration require 'apic=verbose'.
Signed-off-by: Chuck Ebbert <[email protected]>
--- 2.6.16-rc4-64.orig/arch/x86_64/kernel/apic.c
+++ 2.6.16-rc4-64/arch/x86_64/kernel/apic.c
@@ -738,6 +738,12 @@ static void setup_APIC_timer(unsigned in
apic_runs_main_timer++;
}
local_irq_restore(flags);
+
+ if (apic_runs_main_timer == 1) {
+ printk(KERN_WARNING "Could not configure APIC main timer.\n");
+ printk(KERN_WARNING "Try boot option 'disable_timer_pin_1'"
+ " if your system clock runs too fast.\n");
+ }
}
/*
@@ -786,7 +792,7 @@ static int __init calibrate_APIC_clock(v
result = (apic_start - apic) * 1000L * cpu_khz /
(tsc - tsc_start);
}
- printk("result %d\n", result);
+ apic_printk(APIC_VERBOSE,"APIC timer result %d\n", result);
printk(KERN_INFO "Detected %d.%03d MHz APIC timer.\n",
--
Chuck
"Equations are the Devil's sentences." --Stephen Colbert
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
