diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/oprofile | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/oprofile')
-rw-r--r-- | arch/arm/oprofile/op_model_xscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c index 726ad2b3b435..7899d3ca75a3 100644 --- a/arch/arm/oprofile/op_model_xscale.c +++ b/arch/arm/oprofile/op_model_xscale.c | |||
@@ -341,7 +341,7 @@ static void inline __xsc2_check_ctrs(void) | |||
341 | __asm__ __volatile__ ("mcr p14, 0, %0, c5, c1, 0" : : "r" (flag)); | 341 | __asm__ __volatile__ ("mcr p14, 0, %0, c5, c1, 0" : : "r" (flag)); |
342 | } | 342 | } |
343 | 343 | ||
344 | static irqreturn_t xscale_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) | 344 | static irqreturn_t xscale_pmu_interrupt(int irq, void *arg) |
345 | { | 345 | { |
346 | int i; | 346 | int i; |
347 | u32 pmnc; | 347 | u32 pmnc; |
@@ -356,7 +356,7 @@ static irqreturn_t xscale_pmu_interrupt(int irq, void *arg, struct pt_regs *regs | |||
356 | continue; | 356 | continue; |
357 | 357 | ||
358 | write_counter(i, -(u32)results[i].reset_counter); | 358 | write_counter(i, -(u32)results[i].reset_counter); |
359 | oprofile_add_sample(regs, i); | 359 | oprofile_add_sample(get_irq_regs(), i); |
360 | results[i].ovf--; | 360 | results[i].ovf--; |
361 | } | 361 | } |
362 | 362 | ||