1 files changed, 11 insertions, 10 deletions

diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c
index 52a63bfe3f07..f7c25c625a5b 100644
--- a/arch/powerpc/kvm/book3s_pr_papr.c
+++ b/arch/powerpc/kvm/book3s_pr_papr.c
@@ -40,8 +40,9 @@ static int kvmppc_h_pr_enter(struct kvm_vcpu *vcpu)
 {
         long flags = kvmppc_get_gpr(vcpu, 4);
         long pte_index = kvmppc_get_gpr(vcpu, 5);
-        unsigned long pteg[2 * 8];
-        unsigned long pteg_addr, i, *hpte;
+        __be64 pteg[2 * 8];
+        __be64 *hpte;
+        unsigned long pteg_addr, i;
         long int ret;
 
         i = pte_index & 7;
@@ -93,8 +94,8 @@ static int kvmppc_h_pr_remove(struct kvm_vcpu *vcpu)
         pteg = get_pteg_addr(vcpu, pte_index);
         mutex_lock(&vcpu->kvm->arch.hpt_mutex);
         copy_from_user(pte, (void __user *)pteg, sizeof(pte));
-        pte[0] = be64_to_cpu(pte[0]);
-        pte[1] = be64_to_cpu(pte[1]);
+        pte[0] = be64_to_cpu((__force __be64)pte[0]);
+        pte[1] = be64_to_cpu((__force __be64)pte[1]);
 
         ret = H_NOT_FOUND;
         if ((pte[0] & HPTE_V_VALID) == 0 ||
@@ -171,8 +172,8 @@ static int kvmppc_h_pr_bulk_remove(struct kvm_vcpu *vcpu)
 
                 pteg = get_pteg_addr(vcpu, tsh & H_BULK_REMOVE_PTEX);
                 copy_from_user(pte, (void __user *)pteg, sizeof(pte));
-                pte[0] = be64_to_cpu(pte[0]);
-                pte[1] = be64_to_cpu(pte[1]);
+                pte[0] = be64_to_cpu((__force __be64)pte[0]);
+                pte[1] = be64_to_cpu((__force __be64)pte[1]);
 
                 /* tsl = AVPN */
                 flags = (tsh & H_BULK_REMOVE_FLAGS) >> 26;
@@ -211,8 +212,8 @@ static int kvmppc_h_pr_protect(struct kvm_vcpu *vcpu)
         pteg = get_pteg_addr(vcpu, pte_index);
         mutex_lock(&vcpu->kvm->arch.hpt_mutex);
         copy_from_user(pte, (void __user *)pteg, sizeof(pte));
-        pte[0] = be64_to_cpu(pte[0]);
-        pte[1] = be64_to_cpu(pte[1]);
+        pte[0] = be64_to_cpu((__force __be64)pte[0]);
+        pte[1] = be64_to_cpu((__force __be64)pte[1]);
 
         ret = H_NOT_FOUND;
         if ((pte[0] & HPTE_V_VALID) == 0 ||
@@ -231,8 +232,8 @@ static int kvmppc_h_pr_protect(struct kvm_vcpu *vcpu)
 
         rb = compute_tlbie_rb(v, r, pte_index);
         vcpu->arch.mmu.tlbie(vcpu, rb, rb & 1 ? true : false);
-        pte[0] = cpu_to_be64(pte[0]);
-        pte[1] = cpu_to_be64(pte[1]);
+        pte[0] = (__force u64)cpu_to_be64(pte[0]);
+        pte[1] = (__force u64)cpu_to_be64(pte[1]);
         copy_to_user((void __user *)pteg, pte, sizeof(pte));
         ret = H_SUCCESS;