From 273eaf55bdbb9e7b0422f1928e22a53a15be1f76 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sun, 8 Jun 2008 10:13:33 +0200 Subject: [PATCH] --- yaml --- r: 99337 b: refs/heads/master c: ab5a5be099cb20a1c006bf0e211c48502d7ebc44 h: refs/heads/master i: 99335: dac1005eb0af5fd03e9ae63ec230fa0c9c3fb2a4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_32.c | 6 ++---- trunk/arch/x86/kernel/apic_64.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 7d1d401ba1ff..158ba30d0f4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff11571b25152edfb1eb0e6feb7e0009670fe4a5 +refs/heads/master: ab5a5be099cb20a1c006bf0e211c48502d7ebc44 diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c index 3cebf91d500f..4b99b1bdeb6c 100644 --- a/trunk/arch/x86/kernel/apic_32.c +++ b/trunk/arch/x86/kernel/apic_32.c @@ -541,13 +541,11 @@ void __init setup_boot_APIC_clock(void) * PIT/HPET going. Otherwise register lapic as a dummy * device. */ - if (nmi_watchdog != NMI_IO_APIC) { + if (nmi_watchdog != NMI_IO_APIC) lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; - } else { + else printk(KERN_WARNING "APIC timer registered as dummy," " due to nmi_watchdog=1!\n"); - timer_through_8259 = 1; - } } /* Setup the lapic or request the broadcast */ diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c index 6cbc668a4c63..07fda23a9f76 100644 --- a/trunk/arch/x86/kernel/apic_64.c +++ b/trunk/arch/x86/kernel/apic_64.c @@ -413,13 +413,11 @@ void __init setup_boot_APIC_clock(void) * PIT/HPET going. Otherwise register lapic as a dummy * device. */ - if (nmi_watchdog != NMI_IO_APIC) { + if (nmi_watchdog != NMI_IO_APIC) lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; - } else { + else printk(KERN_WARNING "APIC timer registered as dummy," " due to nmi_watchdog=1!\n"); - timer_through_8259 = 1; - } setup_APIC_timer(); }