diff options
author | Tony Luck <tony.luck@intel.com> | 2006-10-17 17:28:16 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-10-17 17:28:16 -0400 |
commit | 3bbe486b361b317ac7103378ed3d1aab4779715e (patch) | |
tree | 3676334ad425b611516c913aa5d3553aa524f839 /arch | |
parent | 4e4bc305e16440ab38060d61fbcb7d774881d2f1 (diff) |
[IA64] perfmon fix for global IRQ fix
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 281004ff7b00..3aaede0d6981 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -5558,12 +5558,13 @@ report_spurious2: | |||
5558 | } | 5558 | } |
5559 | 5559 | ||
5560 | static irqreturn_t | 5560 | static irqreturn_t |
5561 | pfm_interrupt_handler(int irq, void *arg, struct pt_regs *regs) | 5561 | pfm_interrupt_handler(int irq, void *arg) |
5562 | { | 5562 | { |
5563 | unsigned long start_cycles, total_cycles; | 5563 | unsigned long start_cycles, total_cycles; |
5564 | unsigned long min, max; | 5564 | unsigned long min, max; |
5565 | int this_cpu; | 5565 | int this_cpu; |
5566 | int ret; | 5566 | int ret; |
5567 | struct pt_regs *regs = get_irq_regs(); | ||
5567 | 5568 | ||
5568 | this_cpu = get_cpu(); | 5569 | this_cpu = get_cpu(); |
5569 | if (likely(!pfm_alt_intr_handler)) { | 5570 | if (likely(!pfm_alt_intr_handler)) { |