diff options
author | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
commit | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (patch) | |
tree | e9fc247ed3a26f5369a7ec1b1bd0ef66bda7b4dd /arch/powerpc/kvm/book3s_hv.c | |
parent | drm/i915: unpin backing storage in dmabuf_unmap (diff) | |
parent | drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code (diff) | |
download | linux-dev-3387ed83943daf6cb1bb4195ae369067b9cd80ce.tar.xz linux-dev-3387ed83943daf6cb1bb4195ae369067b9cd80ce.zip |
Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel
* tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel: (153 commits)
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv.c')
-rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 2efa9dde741a..7629cd3eb91a 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -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; - if (rmls < 0) { + if ((long)rmls < 0) { 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(); - if (lpid < 0) + if ((long)lpid < 0) return -ENOMEM; kvm->arch.lpid = lpid; |