From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Date: Thu, 15 Mar 2012 12:10:30 +0000 Subject: [PATCH 01/56] KVM: PPC: Book3s_32: Fix compile error Message-Id: <1331813485-14722-2-git-send-email-agraf@suse.de> List-Id: References: <1331813485-14722-1-git-send-email-agraf@suse.de> In-Reply-To: <1331813485-14722-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: kvm-ppc@vger.kernel.org Cc: kvm@vger.kernel.org We were failing to compile on book3s_32 with the following errors: arch/powerpc/kvm/book3s_pr.c:883:45: error: cast to pointer from integer of= different size [-Werror=3Dint-to-pointer-cast] arch/powerpc/kvm/book3s_pr.c:898:79: error: cast to pointer from integer of= different size [-Werror=3Dint-to-pointer-cast] Fix this by explicity casting the u64 to long before we use it as a pointer. Reported-by: J=C3=B6rg Sommer Signed-off-by: Alexander Graf --- arch/powerpc/kvm/book3s_pr.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index ee222ec..f329eae 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -880,7 +880,8 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, s= truct kvm_one_reg *reg) =20 switch (reg->id) { case KVM_REG_PPC_HIOR: - r =3D put_user(to_book3s(vcpu)->hior, (u64 __user *)reg->addr); + r =3D put_user(to_book3s(vcpu)->hior, + (u64 __user *)(long)reg->addr); break; default: break; @@ -895,7 +896,8 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, s= truct kvm_one_reg *reg) =20 switch (reg->id) { case KVM_REG_PPC_HIOR: - r =3D get_user(to_book3s(vcpu)->hior, (u64 __user *)reg->addr); + r =3D get_user(to_book3s(vcpu)->hior, + (u64 __user *)(long)reg->addr); if (!r) to_book3s(vcpu)->hior_explicit =3D true; break; --=20 1.6.0.2