]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] perfmon fix for global IRQ fix
authorTony Luck <tony.luck@intel.com>
Tue, 17 Oct 2006 21:28:16 +0000 (14:28 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 17 Oct 2006 21:28:16 +0000 (14:28 -0700)
Missed one piece of ia64 fallout from the global IRQ patch
 7d12e780e003f93433d49ce78cfedf4b4c52adc5

Perfmon interrupt handler needs to use get_irq_regs() too.

Acked-by: stephane eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/perfmon.c

index 281004ff7b00b87a46de5f91c05c90c706827474..3aaede0d6981783037b1eaec5d0a0b7e364d57ef 100644 (file)
@@ -5558,12 +5558,13 @@ report_spurious2:
 }
 
 static irqreturn_t
-pfm_interrupt_handler(int irq, void *arg, struct pt_regs *regs)
+pfm_interrupt_handler(int irq, void *arg)
 {
        unsigned long start_cycles, total_cycles;
        unsigned long min, max;
        int this_cpu;
        int ret;
+       struct pt_regs *regs = get_irq_regs();
 
        this_cpu = get_cpu();
        if (likely(!pfm_alt_intr_handler)) {