From 0ff25482b43c1883bada32b1303ab788f0f5398c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:33:04 +0100 Subject: [PATCH] --- yaml --- r: 80254 b: refs/heads/master c: 9d09951da948c0ca30944df2a9b78e68d6e0744c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_32.c | 4 +++- trunk/arch/x86/kernel/apic_64.c | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c5a85781f0e..fb31611f8e26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2b84b30b8c8bbccf4d2e32f8a3a70ad09ba9ab8 +refs/heads/master: 9d09951da948c0ca30944df2a9b78e68d6e0744c diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c index 20d4dbc42e6e..d07a603807d1 100644 --- a/trunk/arch/x86/kernel/apic_32.c +++ b/trunk/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/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c index 731b48660fc4..01d4ca27ecf0 100644 --- a/trunk/arch/x86/kernel/apic_64.c +++ b/trunk/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; }