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>

2 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 20d4dbc42e6e..d07a603807d1 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 731b48660fc4..01d4ca27ecf0 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;
         }