x86, vmlinux.lds: unify percpu

[safe/jmp/linux-2.6] / arch / x86 / kernel / time_64.c

diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index 083a4a5..5ba343e 100644 (file)
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -17,10 +17,10 @@
 #include <linux/module.h>
 #include <linux/time.h>
 #include <linux/mca.h>
+#include <linux/nmi.h>
 
 #include <asm/i8253.h>
 #include <asm/hpet.h>
-#include <asm/nmi.h>
 #include <asm/vgtod.h>
 #include <asm/time.h>
 #include <asm/timer.h>
@@ -51,7 +51,7 @@ EXPORT_SYMBOL(profile_pc);
 
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
-       add_pda(irq0_irqs, 1);
+       inc_irq_stat(irq0_irqs);
 
        global_clock_event->event_handler(global_clock_event);
 
@@ -80,6 +80,8 @@ unsigned long __init calibrate_cpu(void)
                        break;
        no_ctr_free = (i == 4);
        if (no_ctr_free) {
+               WARN(1, KERN_WARNING "Warning: AMD perfctrs busy ... "
+                    "cpu_khz value may be incorrect.\n");
                i = 3;
                rdmsrl(MSR_K7_EVNTSEL3, evntsel3);
                wrmsrl(MSR_K7_EVNTSEL3, 0);
@@ -113,8 +115,7 @@ unsigned long __init calibrate_cpu(void)
 
 static struct irqaction irq0 = {
        .handler        = timer_interrupt,
-       .flags          = IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING,
-       .mask           = CPU_MASK_NONE,
+       .flags          = IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING | IRQF_TIMER,
        .name           = "timer"
 };
 
@@ -123,7 +124,6 @@ void __init hpet_time_init(void)
        if (!hpet_enable())
                setup_pit_timer();
 
-       irq0.mask = cpumask_of_cpu(0);
        setup_irq(0, &irq0);
 }