From f9dbc3a54ce01d45b03c4280cbf8015c3baf5aad Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Fri, 10 Oct 2008 19:00:17 +0400 Subject: [PATCH] --- yaml --- r: 116537 b: refs/heads/master c: 81608f3c254512b906ab78082ec5966b376aacd5 h: refs/heads/master i: 116535: 9f062024c17fb64f9a38e86607b228362f4e9649 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8955ac2f23b4..80852fe34d76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c66a73f0796dacc2ff0d4af75794ec843ceb3d1 +refs/heads/master: 81608f3c254512b906ab78082ec5966b376aacd5 diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c index 1f48bd1c9f2d..04a7f960bbc0 100644 --- a/trunk/arch/x86/kernel/apic.c +++ b/trunk/arch/x86/kernel/apic.c @@ -332,11 +332,7 @@ int lapic_get_maxlvt(void) */ /* Clock divisor */ -#ifdef CONFG_X86_64 -#define APIC_DIVISOR 1 -#else #define APIC_DIVISOR 16 -#endif /* * This function sets up the local APIC timer, with a timeout of @@ -592,10 +588,10 @@ static int __init calibrate_APIC_clock(void) global_clock_event->event_handler = lapic_cal_handler; /* - * Setup the APIC counter to 1e9. There is no way the lapic + * Setup the APIC counter to maximum. There is no way the lapic * can underflow in the 100ms detection time frame */ - __setup_APIC_LVTT(1000000000, 0, 0); + __setup_APIC_LVTT(0xffffffff, 0, 0); /* Let the interrupts run */ local_irq_enable();