Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d09951d authored Jan 30, 2008 by Thomas Gleixner Committed by Ingo Molnar Jan 30, 2008

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>

parent c2b84b30

arch/x86/kernel/apic_32.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

arch/x86/kernel/apic_64.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}