Patchwork powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug

login
register
mail settings
Submitter Kyle Moffett
Date Aug. 27, 2010, 7:06 p.m.
Message ID <1282936005-17078-1-git-send-email-Kyle.D.Moffett@boeing.com>
Download mbox | patch
Permalink /patch/62871/
State Not Applicable
Headers show

Comments

Kyle Moffett - Aug. 27, 2010, 7:06 p.m.
The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
parameters to trace_kvm_stlb_inval().  This appears to be a bad
copy-paste from a call to trace_kvm_stlb_write().

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
---
 arch/powerpc/kvm/e500_tlb.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Alexander Graf - Aug. 28, 2010, 12:58 a.m.
On 27.08.2010, at 21:06, Kyle Moffett wrote:

> The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
> parameters to trace_kvm_stlb_inval().  This appears to be a bad
> copy-paste from a call to trace_kvm_stlb_write().

Which kernel is this against? That trace point is already commented out in my tree.


Alex
Kyle Moffett - Aug. 28, 2010, 5:24 a.m.
On Fri, Aug 27, 2010 at 20:58, Alexander Graf <agraf@suse.de> wrote:
> On 27.08.2010, at 21:06, Kyle Moffett wrote:
>> The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
>> parameters to trace_kvm_stlb_inval().  This appears to be a bad
>> copy-paste from a call to trace_kvm_stlb_write().
>
> Which kernel is this against? That trace point is already commented out in my tree.

Oh, hm, I guess I haven't rebased this patch since 2.6.35-ish.  The
trace point seems to work correctly with the fixed arguments; if
you'll tell me which tree I should base it on I can easily resubmit.

Cheers,
Kyle Moffett
Alexander Graf - Aug. 28, 2010, 10:51 a.m.
On 28.08.2010, at 07:24, Kyle Moffett wrote:

> On Fri, Aug 27, 2010 at 20:58, Alexander Graf <agraf@suse.de> wrote:
>> On 27.08.2010, at 21:06, Kyle Moffett wrote:
>>> The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
>>> parameters to trace_kvm_stlb_inval().  This appears to be a bad
>>> copy-paste from a call to trace_kvm_stlb_write().
>> 
>> Which kernel is this against? That trace point is already commented out in my tree.
> 
> Oh, hm, I guess I haven't rebased this patch since 2.6.35-ish.  The
> trace point seems to work correctly with the fixed arguments; if
> you'll tell me which tree I should base it on I can easily resubmit.

My tree is at git://github.com/agraf/linux-2.6.git kvm-ppc-next. If you like I'll gladly take a patch in to enable the point again :).

Alex

Patch

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 21011e1..1261a21 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -226,8 +226,7 @@  static void kvmppc_e500_stlbe_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500,
 
 	kvmppc_e500_shadow_release(vcpu_e500, tlbsel, esel);
 	stlbe->mas1 = 0;
-	trace_kvm_stlb_inval(index_of(tlbsel, esel), stlbe->mas1, stlbe->mas2,
-			     stlbe->mas3, stlbe->mas7);
+	trace_kvm_stlb_inval(index_of(tlbsel, esel));
 }
 
 static void kvmppc_e500_tlb1_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500,