Patchwork [38/38] ppc: e500_tlb memset clears nothing

login
register
mail settings
Submitter Alexander Graf
Date Aug. 14, 2012, 11:04 p.m.
Message ID <1344985483-7440-39-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/177477/
State New
Headers show

Comments

Alexander Graf - Aug. 14, 2012, 11:04 p.m.
From: Alan Cox <alan@linux.intel.com>

Put the parameters the right way around

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=44031

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/kvm/e500_tlb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Avi Kivity - Aug. 15, 2012, 10:07 a.m.
On 08/15/2012 02:04 AM, Alexander Graf wrote:
> From: Alan Cox <alan@linux.intel.com>
> 
> Put the parameters the right way around
> 
> Addresses https://bugzilla.kernel.org/show_bug.cgi?id=44031
> 


Should this go to 3.6 (and backports etc.)?
Alexander Graf - Aug. 15, 2012, 10:09 a.m.
On 15.08.2012, at 12:07, Avi Kivity wrote:

> On 08/15/2012 02:04 AM, Alexander Graf wrote:
>> From: Alan Cox <alan@linux.intel.com>
>> 
>> Put the parameters the right way around
>> 
>> Addresses https://bugzilla.kernel.org/show_bug.cgi?id=44031
>> 
> 
> 
> Should this go to 3.6 (and backports etc.)?

This one is even less crucial than the icache fix. Should I assemble a separate patch queue with patches that should go into 3.6?


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Avi Kivity - Aug. 15, 2012, 10:10 a.m.
On 08/15/2012 01:09 PM, Alexander Graf wrote:
> 
> On 15.08.2012, at 12:07, Avi Kivity wrote:
> 
>> On 08/15/2012 02:04 AM, Alexander Graf wrote:
>>> From: Alan Cox <alan@linux.intel.com>
>>> 
>>> Put the parameters the right way around
>>> 
>>> Addresses https://bugzilla.kernel.org/show_bug.cgi?id=44031
>>> 
>> 
>> 
>> Should this go to 3.6 (and backports etc.)?
> 
> This one is even less crucial than the icache fix. Should I assemble a separate patch queue with patches that should go into 3.6?

Yes please.

Patch

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 6340b3c..1af6fab 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -320,11 +320,11 @@  static inline void kvmppc_e500_ref_release(struct tlbe_ref *ref)
 static void clear_tlb1_bitmap(struct kvmppc_vcpu_e500 *vcpu_e500)
 {
 	if (vcpu_e500->g2h_tlb1_map)
-		memset(vcpu_e500->g2h_tlb1_map,
-		       sizeof(u64) * vcpu_e500->gtlb_params[1].entries, 0);
+		memset(vcpu_e500->g2h_tlb1_map, 0,
+		       sizeof(u64) * vcpu_e500->gtlb_params[1].entries);
 	if (vcpu_e500->h2g_tlb1_rmap)
-		memset(vcpu_e500->h2g_tlb1_rmap,
-		       sizeof(unsigned int) * host_tlb_params[1].entries, 0);
+		memset(vcpu_e500->h2g_tlb1_rmap, 0,
+		       sizeof(unsigned int) * host_tlb_params[1].entries);
 }
 
 static void clear_tlb_privs(struct kvmppc_vcpu_e500 *vcpu_e500)