diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 2ccb3d138f46..00b8a3f855f4 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -1749,8 +1749,8 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,
 		       record_hpte(flags, hptp, hpte, revp, 1, first_pass)) {
 			/* valid entry, write it out */
 			++hdr.n_valid;
-			if (__put_user(hpte[0], lbuf) ||
-			    __put_user(hpte[1], lbuf + 1))
+			if (put_user(hpte[0], lbuf) ||
+			    put_user(hpte[1], lbuf + 1))
 				return -EFAULT;
 			nb += HPTE_SIZE;
 			lbuf += 2;
@@ -1853,8 +1853,8 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,
 			__be64 hpte_r;
 
 			err = -EFAULT;
-			if (__get_user(hpte_v, lbuf) ||
-			    __get_user(hpte_r, lbuf + 1))
+			if (get_user(hpte_v, lbuf) ||
+			    get_user(hpte_r, lbuf + 1))
 				goto out;
 			v = be64_to_cpu(hpte_v);
 			r = be64_to_cpu(hpte_r);