projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' into next
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
powerpc
/
kvm
/
book3s_hv.c
diff --git
a/arch/powerpc/kvm/book3s_hv.c
b/arch/powerpc/kvm/book3s_hv.c
index
2efa9dd
..
e8d51cb
100644
(file)
--- a/
arch/powerpc/kvm/book3s_hv.c
+++ b/
arch/powerpc/kvm/book3s_hv.c
@@
-217,7
+217,7
@@
struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)
static void init_vpa(struct kvm_vcpu *vcpu, struct lppaca *vpa)
{
static void init_vpa(struct kvm_vcpu *vcpu, struct lppaca *vpa)
{
- vpa->
shared_proc = 1
;
+ vpa->
__old_status |= LPPACA_OLD_SHARED_PROC
;
vpa->yield_count = 1;
}
vpa->yield_count = 1;
}
@@
-1809,7
+1809,7
@@
static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
rma_size <<= PAGE_SHIFT;
rmls = lpcr_rmls(rma_size);
err = -EINVAL;
rma_size <<= PAGE_SHIFT;
rmls = lpcr_rmls(rma_size);
err = -EINVAL;
- if (rmls < 0) {
+ if (
(long)
rmls < 0) {
pr_err("KVM: Can't use RMA of 0x%lx bytes\n", rma_size);
goto out_srcu;
}
pr_err("KVM: Can't use RMA of 0x%lx bytes\n", rma_size);
goto out_srcu;
}
@@
-1874,7
+1874,7
@@
int kvmppc_core_init_vm(struct kvm *kvm)
/* Allocate the guest's logical partition ID */
lpid = kvmppc_alloc_lpid();
/* Allocate the guest's logical partition ID */
lpid = kvmppc_alloc_lpid();
- if (lpid < 0)
+ if (
(long)
lpid < 0)
return -ENOMEM;
kvm->arch.lpid = lpid;
return -ENOMEM;
kvm->arch.lpid = lpid;