Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / arch / x86 / kernel / apic_64.c

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 09b82093bc759e5aa9eb1f9003bf7d4c822d0679..f47bc493dba94fbbb4dd8b8ee68bbf3f445109b0 100644 (file)
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -974,15 +974,12 @@ void __init setup_boot_APIC_clock (void)
  */
 void __cpuinit check_boot_apic_timer_broadcast(void)
 {
-       struct clock_event_device *levt = &per_cpu(lapic_events, boot_cpu_id);
-
        if (!disable_apic_timer ||
            (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY))
                return;
 
        printk(KERN_INFO "AMD C1E detected late. Force timer broadcast.\n");
        lapic_clockevent.features |= CLOCK_EVT_FEAT_DUMMY;
-       levt->features |= CLOCK_EVT_FEAT_DUMMY;
 
        local_irq_enable();
        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, &boot_cpu_id);
@@ -1143,6 +1140,7 @@ asmlinkage void smp_spurious_interrupt(void)
        if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
                ack_APIC_irq();
 
+       add_pda(irq_spurious_count, 1);
        irq_exit();
 }