From: Thomas Gleixner Date: Wed, 30 Jan 2008 12:33:04 +0000 (+0100) Subject: x86: preset apic clockevents multiplicator X-Git-Tag: v2.6.25-rc1~1143^2~321 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d09951da948c0ca30944df2a9b78e68d6e0744c;p=linux-2.6 x86: preset apic clockevents multiplicator The check for an unitialized clock event device triggers, when the local apic timer is registered as a dummy clock event device for broadcasting. Preset the multiplicator to avoid a false positive. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 20d4dbc42e..d07a603807 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -377,8 +377,10 @@ void __init setup_boot_APIC_clock(void) */ if (local_apic_timer_disabled) { /* No broadcast on UP ! */ - if (num_possible_cpus() > 1) + if (num_possible_cpus() > 1) { + lapic_clockevent.mult = 1; setup_APIC_timer(); + } return; } diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 731b48660f..01d4ca27ec 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -375,8 +375,10 @@ void __init setup_boot_APIC_clock(void) if (disable_apic_timer) { printk(KERN_INFO "Disabling APIC timer\n"); /* No broadcast on UP ! */ - if (num_possible_cpus() > 1) + if (num_possible_cpus() > 1) { + lapic_clockevent.mult = 1; setup_APIC_timer(); + } return; }