Commit 9d242462 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

[PATCH] ppc32: fix for e500 oprofile build

Fix for trivial fix for 2.6.11 oprofile compilation on e500 based ppc.
Signed-off-by: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 30b4c1c8
...@@ -150,7 +150,6 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs, ...@@ -150,7 +150,6 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs,
int is_kernel; int is_kernel;
int val; int val;
int i; int i;
unsigned int cpu = smp_processor_id();
/* set the PMM bit (see comment below) */ /* set the PMM bit (see comment below) */
mtmsr(mfmsr() | MSR_PMM); mtmsr(mfmsr() | MSR_PMM);
...@@ -162,7 +161,7 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs, ...@@ -162,7 +161,7 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs,
val = ctr_read(i); val = ctr_read(i);
if (val < 0) { if (val < 0) {
if (oprofile_running && ctr[i].enabled) { if (oprofile_running && ctr[i].enabled) {
oprofile_add_sample(pc, is_kernel, i, cpu); oprofile_add_pc(pc, is_kernel, i);
ctr_write(i, reset_value[i]); ctr_write(i, reset_value[i]);
} else { } else {
ctr_write(i, 0); ctr_write(i, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment