diff options
Diffstat (limited to 'arch/powerpc/kvm/book3s_32_mmu.c')
-rw-r--r-- | arch/powerpc/kvm/book3s_32_mmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kvm/book3s_32_mmu.c b/arch/powerpc/kvm/book3s_32_mmu.c index 3292d76101d2..449bce5f021a 100644 --- a/arch/powerpc/kvm/book3s_32_mmu.c +++ b/arch/powerpc/kvm/book3s_32_mmu.c | |||
@@ -133,7 +133,7 @@ static int kvmppc_mmu_book3s_32_xlate_bat(struct kvm_vcpu *vcpu, gva_t eaddr, | |||
133 | else | 133 | else |
134 | bat = &vcpu_book3s->ibat[i]; | 134 | bat = &vcpu_book3s->ibat[i]; |
135 | 135 | ||
136 | if (vcpu->arch.msr & MSR_PR) { | 136 | if (vcpu->arch.shared->msr & MSR_PR) { |
137 | if (!bat->vp) | 137 | if (!bat->vp) |
138 | continue; | 138 | continue; |
139 | } else { | 139 | } else { |
@@ -214,8 +214,8 @@ static int kvmppc_mmu_book3s_32_xlate_pte(struct kvm_vcpu *vcpu, gva_t eaddr, | |||
214 | pte->raddr = (pteg[i+1] & ~(0xFFFULL)) | (eaddr & 0xFFF); | 214 | pte->raddr = (pteg[i+1] & ~(0xFFFULL)) | (eaddr & 0xFFF); |
215 | pp = pteg[i+1] & 3; | 215 | pp = pteg[i+1] & 3; |
216 | 216 | ||
217 | if ((sre->Kp && (vcpu->arch.msr & MSR_PR)) || | 217 | if ((sre->Kp && (vcpu->arch.shared->msr & MSR_PR)) || |
218 | (sre->Ks && !(vcpu->arch.msr & MSR_PR))) | 218 | (sre->Ks && !(vcpu->arch.shared->msr & MSR_PR))) |
219 | pp |= 4; | 219 | pp |= 4; |
220 | 220 | ||
221 | pte->may_write = false; | 221 | pte->may_write = false; |
@@ -334,7 +334,7 @@ static int kvmppc_mmu_book3s_32_esid_to_vsid(struct kvm_vcpu *vcpu, ulong esid, | |||
334 | struct kvmppc_sr *sr; | 334 | struct kvmppc_sr *sr; |
335 | u64 gvsid = esid; | 335 | u64 gvsid = esid; |
336 | 336 | ||
337 | if (vcpu->arch.msr & (MSR_DR|MSR_IR)) { | 337 | if (vcpu->arch.shared->msr & (MSR_DR|MSR_IR)) { |
338 | sr = find_sr(to_book3s(vcpu), ea); | 338 | sr = find_sr(to_book3s(vcpu), ea); |
339 | if (sr->valid) | 339 | if (sr->valid) |
340 | gvsid = sr->vsid; | 340 | gvsid = sr->vsid; |
@@ -343,7 +343,7 @@ static int kvmppc_mmu_book3s_32_esid_to_vsid(struct kvm_vcpu *vcpu, ulong esid, | |||
343 | /* In case we only have one of MSR_IR or MSR_DR set, let's put | 343 | /* In case we only have one of MSR_IR or MSR_DR set, let's put |
344 | that in the real-mode context (and hope RM doesn't access | 344 | that in the real-mode context (and hope RM doesn't access |
345 | high memory) */ | 345 | high memory) */ |
346 | switch (vcpu->arch.msr & (MSR_DR|MSR_IR)) { | 346 | switch (vcpu->arch.shared->msr & (MSR_DR|MSR_IR)) { |
347 | case 0: | 347 | case 0: |
348 | *vsid = VSID_REAL | esid; | 348 | *vsid = VSID_REAL | esid; |
349 | break; | 349 | break; |
@@ -363,7 +363,7 @@ static int kvmppc_mmu_book3s_32_esid_to_vsid(struct kvm_vcpu *vcpu, ulong esid, | |||
363 | BUG(); | 363 | BUG(); |
364 | } | 364 | } |
365 | 365 | ||
366 | if (vcpu->arch.msr & MSR_PR) | 366 | if (vcpu->arch.shared->msr & MSR_PR) |
367 | *vsid |= VSID_PR; | 367 | *vsid |= VSID_PR; |
368 | 368 | ||
369 | return 0; | 369 | return 0; |