summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:33:04 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:33:04 +0100
commit9d09951da948c0ca30944df2a9b78e68d6e0744c (patch)
tree869b0d15f38318a474c5f99bfa5d5b322f7eb8d7 /arch/x86/kernel/apic_64.c
parentc2b84b30b8c8bbccf4d2e32f8a3a70ad09ba9ab8 (diff)
downloadop-kernel-dev-9d09951da948c0ca30944df2a9b78e68d6e0744c.zip
op-kernel-dev-9d09951da948c0ca30944df2a9b78e68d6e0744c.tar.gz
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 <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 731b486..01d4ca2 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;
}
OpenPOWER on IntegriCloud