diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-06-07 07:47:30 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-06-07 07:47:30 +0100 |
commit | 4244952130c925c126c248f5059718538cbe9e2b (patch) | |
tree | 434b946eacf56eba1e655051e16cd1933ccc57b3 /xen/arch/x86/apic.c | |
parent | 81265c2af93866eb909491fe294fe343ca0c1e60 (diff) | |
download | xen-4244952130c925c126c248f5059718538cbe9e2b.tar.gz xen-4244952130c925c126c248f5059718538cbe9e2b.tar.bz2 xen-4244952130c925c126c248f5059718538cbe9e2b.zip |
x86: Small APIC timer initialisation cleanup
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/apic.c')
-rw-r--r-- | xen/arch/x86/apic.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 248d373667..c21811f0d5 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1064,11 +1064,11 @@ static void __setup_APIC_LVTT(unsigned int clocks) apic_write_around(APIC_TMICT, clocks/APIC_DIVISOR); } -static void __devinit setup_APIC_timer(unsigned int clocks) +static void __devinit setup_APIC_timer(void) { unsigned long flags; local_irq_save(flags); - __setup_APIC_LVTT(clocks); + __setup_APIC_LVTT(0); local_irq_restore(flags); } @@ -1159,8 +1159,6 @@ static int __init calibrate_APIC_clock(void) return result; } -static unsigned int calibration_result; - void __init setup_boot_APIC_clock(void) { unsigned long flags; @@ -1169,18 +1167,16 @@ void __init setup_boot_APIC_clock(void) local_irq_save(flags); - calibration_result = calibrate_APIC_clock(); - /* - * Now set up the timer for real. - */ - setup_APIC_timer(calibration_result); + calibrate_APIC_clock(); + + setup_APIC_timer(); local_irq_restore(flags); } void __devinit setup_secondary_APIC_clock(void) { - setup_APIC_timer(calibration_result); + setup_APIC_timer(); } void disable_APIC_timer(void) |