summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-10-17 14:28:16 -0700
committerTony Luck <tony.luck@intel.com>2006-10-17 14:28:16 -0700
commit3bbe486b361b317ac7103378ed3d1aab4779715e (patch)
tree3676334ad425b611516c913aa5d3553aa524f839 /arch
parent4e4bc305e16440ab38060d61fbcb7d774881d2f1 (diff)
downloadop-kernel-dev-3bbe486b361b317ac7103378ed3d1aab4779715e.zip
op-kernel-dev-3bbe486b361b317ac7103378ed3d1aab4779715e.tar.gz
[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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 281004f..3aaede0 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -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)) {
OpenPOWER on IntegriCloud