diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S
index 0676ae2..64f9018 100644
--- a/arch/powerpc/kvm/book3s_segment.S
+++ b/arch/powerpc/kvm/book3s_segment.S
@@ -347,6 +347,13 @@ no_dcbz32_off:
 	/* Load highmem handler address */
 	mtsrr0	r8
 
+#ifdef CONFIG_PPC64
+BEGIN_FTR_SECTION
+	mtspr	SPRN_HSRR1, r6
+	mtspr	SPRN_HSRR0, r8
+END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
+#endif
+
 	/* RFI into the highmem handler, or jump to interrupt handler */
 	beqctr
 	RFI