Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / i386 / kernel / cpu / mcheck / p4.c

diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/i386/kernel/cpu/mcheck/p4.c
index b31fc00..fd2c459 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/p4.c
+++ b/arch/i386/kernel/cpu/mcheck/p4.c
@@ -6,7 +6,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/config.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
 
@@ -40,6 +39,7 @@ static void unexpected_thermal_interrupt(struct pt_regs *regs)
 {      
        printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n",
                        smp_processor_id());
+       add_taint(TAINT_MACHINE_CHECK);
 }
 
 /* P4/Xeon Thermal transition interrupt handler */
@@ -60,6 +60,7 @@ static void intel_thermal_interrupt(struct pt_regs *regs)
                printk(KERN_EMERG "CPU%d: Temperature above threshold\n", cpu);
                printk(KERN_EMERG "CPU%d: Running in modulated clock mode\n",
                                cpu);
+               add_taint(TAINT_MACHINE_CHECK);
        } else {
                printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);
        }
@@ -68,15 +69,15 @@ static void intel_thermal_interrupt(struct pt_regs *regs)
 /* Thermal interrupt handler for this CPU setup */
 static void (*vendor_thermal_interrupt)(struct pt_regs *regs) = unexpected_thermal_interrupt;
 
-asmlinkage void smp_thermal_interrupt(struct pt_regs regs)
+fastcall void smp_thermal_interrupt(struct pt_regs *regs)
 {
        irq_enter();
-       vendor_thermal_interrupt(&regs);
+       vendor_thermal_interrupt(regs);
        irq_exit();
 }
 
 /* P4/Xeon Thermal regulation detect and init */
-static void __init intel_init_thermal(struct cpuinfo_x86 *c)
+static void intel_init_thermal(struct cpuinfo_x86 *c)
 {
        u32 l, h;
        unsigned int cpu = smp_processor_id();
@@ -157,7 +158,7 @@ done:
        return mce_num_extended_msrs;
 }
 
-static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code)
+static fastcall void intel_machine_check(struct pt_regs * regs, long error_code)
 {
        int recover=1;
        u32 alow, ahigh, high, low;
@@ -222,6 +223,7 @@ static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_cod
                        wrmsr(msr, 0UL, 0UL);
                        /* Serialize */
                        wmb();
+                       add_taint(TAINT_MACHINE_CHECK);
                }
        }
        mcgstl &= ~(1<<2);
@@ -229,7 +231,7 @@ static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_cod
 }
 
 
-void __init intel_p4_mcheck_init(struct cpuinfo_x86 *c)
+void intel_p4_mcheck_init(struct cpuinfo_x86 *c)
 {
        u32 l, h;
        int i;