From a89e58db451bbef1985a7fb1f0420c9b256043f6 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Wed, 22 Aug 2012 15:04:23 +0000 Subject: [PATCH] --- yaml --- r: 343491 b: refs/heads/master c: e400e72f250d2567e89c9bafb47ab91e8d9a15a2 h: refs/heads/master i: 343489: 023bddc172592b86bd6619b562f590b51beaf2cd 343487: f1cce6d5a3a51f68bd051cc2cdca0a2475a57849 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/e500_tlb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27212e3f6d75..c5f7dedac138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70bddfefbdcdbfdebd81d8b59ff8a7fa5d450ccc +refs/heads/master: e400e72f250d2567e89c9bafb47ab91e8d9a15a2 diff --git a/trunk/arch/powerpc/kvm/e500_tlb.c b/trunk/arch/powerpc/kvm/e500_tlb.c index 43489a8fa985..a27d134eef36 100644 --- a/trunk/arch/powerpc/kvm/e500_tlb.c +++ b/trunk/arch/powerpc/kvm/e500_tlb.c @@ -1385,7 +1385,7 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) if (!vcpu_e500->gtlb_priv[1]) goto err; - vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(unsigned int) * + vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(u64) * vcpu_e500->gtlb_params[1].entries, GFP_KERNEL); if (!vcpu_e500->g2h_tlb1_map)