diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 672accbd5b4a0108b47d83e6ede08b1578af96d2..053a95cdcec76e5f1bc31a75e7bea1f2760556e3 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2523,10 +2523,6 @@ static void cpu_enable_arch_xcall_xint(const struct arm64_cpu_capabilities *__un
 
 	el = read_sysreg(CurrentEL);
 	if (el == CurrentEL_EL2) {
-		/*
-		 * Enable EL2 trap when access ACTLR_EL1 in guest kernel.
-		 */
-		write_sysreg_s(read_sysreg_s(SYS_HCR_EL2) | HCR_TACR, SYS_HCR_EL2);
 		actlr_el2 = read_sysreg(actlr_el2);
 		actlr_el2 |= ACTLR_ELx_XINT;
 		write_sysreg(actlr_el2, actlr_el2);
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index ff00ad782d7d3dfd28f943825cd5674f0cad03ef..9a404daeb2ffc0cd172c1546473bf27571a6f9f2 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -281,8 +281,10 @@ static bool access_actlr(struct kvm_vcpu *vcpu,
 {
 	u64 mask, shift;
 
-	if (p->is_write)
-		return ignore_write(vcpu, p);
+	if (p->is_write) {
+		vcpu_write_sys_reg(vcpu, p->regval, r->reg);
+		return true;
+	}
 
 	get_access_mask(r, &mask, &shift);
 	p->regval = (vcpu_read_sys_reg(vcpu, r->reg) & mask) >> shift;