From b93dcae8747a173b4afd6fe8317fbc56408ea6d1 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 29 Jul 2010 15:04:16 +0200 Subject: [PATCH] --- yaml --- r: 215703 b: refs/heads/master c: 5302104235f0e9f05781b92a4ab25d20e4537f56 h: refs/heads/master i: 215701: 1c791d6f39adf4c26ca004108eadd9902bd46ea3 215699: a7cf3f7a9c1f463a48de7da48cdf2b837e430424 215695: 40e599ed3ed556fe97150607b75f1125349ec2d4 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_32_mmu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 88225c4de28b..bb07c3a3330c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15711e9c927bfc08e66791cbf0ca7887c0880768 +refs/heads/master: 5302104235f0e9f05781b92a4ab25d20e4537f56 diff --git a/trunk/arch/powerpc/kvm/book3s_32_mmu.c b/trunk/arch/powerpc/kvm/book3s_32_mmu.c index a7d121adc842..5bf4bf8c9e65 100644 --- a/trunk/arch/powerpc/kvm/book3s_32_mmu.c +++ b/trunk/arch/powerpc/kvm/book3s_32_mmu.c @@ -104,7 +104,7 @@ static hva_t kvmppc_mmu_book3s_32_get_pteg(struct kvmppc_vcpu_book3s *vcpu_book3 pteg = (vcpu_book3s->sdr1 & 0xffff0000) | hash; dprintk("MMU: pc=0x%lx eaddr=0x%lx sdr1=0x%llx pteg=0x%x vsid=0x%x\n", - vcpu_book3s->vcpu.arch.pc, eaddr, vcpu_book3s->sdr1, pteg, + kvmppc_get_pc(&vcpu_book3s->vcpu), eaddr, vcpu_book3s->sdr1, pteg, sre->vsid); r = gfn_to_hva(vcpu_book3s->vcpu.kvm, pteg >> PAGE_SHIFT); @@ -269,7 +269,7 @@ static int kvmppc_mmu_book3s_32_xlate_pte(struct kvm_vcpu *vcpu, gva_t eaddr, dprintk_pte("KVM MMU: No PTE found (sdr1=0x%llx ptegp=0x%lx)\n", to_book3s(vcpu)->sdr1, ptegp); for (i=0; i<16; i+=2) { - dprintk_pte(" %02d: 0x%x - 0x%x (0x%llx)\n", + dprintk_pte(" %02d: 0x%x - 0x%x (0x%x)\n", i, pteg[i], pteg[i+1], ptem); } }