diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h
index ce85d55fb981..56e5edcc5aee 100644
--- a/arch/arm64/include/asm/kvm_pgtable.h
+++ b/arch/arm64/include/asm/kvm_pgtable.h
@@ -234,7 +234,7 @@ enum kvm_pgtable_prot {
 
 #define KVM_HOST_S2_DEFAULT_MMIO_PTE		\
 	(KVM_HOST_S2_DEFAULT_MEM_PTE |		\
-	KVM_PTE_LEAF_ATTR_HI_S2_XN)
+	FIELD_PREP(KVM_PTE_LEAF_ATTR_HI_S2_XN, KVM_PTE_LEAF_ATTR_HI_S2_XN_XN))
 
 #define PAGE_HYP		KVM_PGTABLE_PROT_RW
 #define PAGE_HYP_EXEC		(KVM_PGTABLE_PROT_R | KVM_PGTABLE_PROT_X)