1 files changed, 0 insertions, 6 deletions

diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index ad1fc0194476..ad7bee97de77 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -581,11 +581,8 @@ kvmppc_hv_entry:
 1:
 #endif
 
-        /* Use cr7 as an indication of radix mode */
         ld      r5, HSTATE_KVM_VCORE(r13)
         ld      r9, VCORE_KVM(r5)       /* pointer to struct kvm */
-        lbz     r0, KVM_RADIX(r9)
-        cmpwi   cr7, r0, 0
 
         /*
          * POWER7/POWER8 host -> guest partition switch code.
@@ -608,9 +605,6 @@ kvmppc_hv_entry:
         cmpwi   r6,0
         bne     10f
 
-        /* Radix has already switched LPID and flushed core TLB */
-        bne     cr7, 22f
-
         lwz     r7,KVM_LPID(r9)
 BEGIN_FTR_SECTION
         ld      r6,KVM_SDR1(r9)