lkml.org 
[lkml]   [2008]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] x86: Remove pt_regs arg from smp_thermal_interrupt
    From
    Date
    The pt_regs arg is never used, make it agree with the other
    definitions of smp_thermal_interrupt.

    It doesn't look like smp_thermal_interrupt is even called on
    32-bit...

    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    ---
    Andrew, this is a fairly dumb patch, but works-for-me(tm)

    arch/x86/kernel/cpu/mcheck/p4.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
    index cb03345..866105a 100644
    --- a/arch/x86/kernel/cpu/mcheck/p4.c
    +++ b/arch/x86/kernel/cpu/mcheck/p4.c
    @@ -36,7 +36,7 @@ static int mce_num_extended_msrs = 0;


    #ifdef CONFIG_X86_MCE_P4THERMAL
    -static void unexpected_thermal_interrupt(struct pt_regs *regs)
    +static void unexpected_thermal_interrupt(void)
    {
    printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n",
    smp_processor_id());
    @@ -44,7 +44,7 @@ static void unexpected_thermal_interrupt(struct pt_regs *regs)
    }

    /* P4/Xeon Thermal transition interrupt handler */
    -static void intel_thermal_interrupt(struct pt_regs *regs)
    +static void intel_thermal_interrupt(void)
    {
    __u64 msr_val;

    @@ -55,12 +55,12 @@ 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;
    +static void (*vendor_thermal_interrupt)(void) = unexpected_thermal_interrupt;

    void smp_thermal_interrupt(struct pt_regs *regs)
    {
    irq_enter();
    - vendor_thermal_interrupt(regs);
    + vendor_thermal_interrupt();
    __get_cpu_var(irq_stat).irq_thermal_count++;
    irq_exit();
    }
    --
    1.5.4.rc4.1142.gf5a97




    \
     
     \ /
      Last update: 2008-02-03 01:53    [W:3.117 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site