projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
kvm
/
book3s_pr.c
diff --git
a/arch/powerpc/kvm/book3s_pr.c
b/arch/powerpc/kvm/book3s_pr.c
index
a78e0e6
..
95bceca
100644
(file)
--- a/
arch/powerpc/kvm/book3s_pr.c
+++ b/
arch/powerpc/kvm/book3s_pr.c
@@
-512,7
+512,7
@@
static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte)
put_page(hpage);
}
put_page(hpage);
}
-static
int
kvmppc_visible_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)
+static
bool
kvmppc_visible_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)
{
ulong mp_pa = vcpu->arch.magic_page_pa;
{
ulong mp_pa = vcpu->arch.magic_page_pa;
@@
-521,7
+521,7
@@
static int kvmppc_visible_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)
gpa &= ~0xFFFULL;
if (unlikely(mp_pa) && unlikely((mp_pa & KVM_PAM) == (gpa & KVM_PAM))) {
gpa &= ~0xFFFULL;
if (unlikely(mp_pa) && unlikely((mp_pa & KVM_PAM) == (gpa & KVM_PAM))) {
- return
1
;
+ return
true
;
}
return kvm_is_visible_gfn(vcpu->kvm, gpa >> PAGE_SHIFT);
}
return kvm_is_visible_gfn(vcpu->kvm, gpa >> PAGE_SHIFT);