2005-03-04 19:16:54

by Kumar Gala

Subject: [PATCH] ppc32: trivial fix for e500 oprofile build

Andrew, Greg

Here is a patch for the new 2.6.11 release tree and for Linus.

Fix for trivial fix for 2.6.11 oprofile compilation on e500 based ppc.

Signed-off-by: Andy Fleming <[email protected]>
Signed-off-by: Kumar Gala <[email protected]>

---

diff -Nru a/arch/ppc/oprofile/op_model_fsl_booke.c b/arch/ppc/oprofile/op_model_fsl_booke.c
--- a/arch/ppc/oprofile/op_model_fsl_booke.c 2005-03-04 13:02:52 -06:00
+++ b/arch/ppc/oprofile/op_model_fsl_booke.c 2005-03-04 13:02:52 -06:00
@@ -150,7 +150,6 @@
int is_kernel;
int val;
int i;
- unsigned int cpu = smp_processor_id();

/* set the PMM bit (see comment below) */
mtmsr(mfmsr() | MSR_PMM);
@@ -162,7 +161,7 @@
val = ctr_read(i);
if (val < 0) {
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]);
} else {
ctr_write(i, 0);

2005-03-09 19:21:03

by Greg KH

Subject: Re: [PATCH] ppc32: trivial fix for e500 oprofile build

On Fri, Mar 04, 2005 at 01:09:18PM -0600, Kumar Gala wrote:
> Andrew, Greg
>
> Here is a patch for the new 2.6.11 release tree and for Linus.
>
> Fix for trivial fix for 2.6.11 oprofile compilation on e500 based ppc.
>
> Signed-off-by: Andy Fleming <[email protected]>
> Signed-off-by: Kumar Gala <[email protected]>

Added to the -stable queue, thanks.

greg k-h