Merge "arm64: issue isb when trapping CNTVCT_EL0 access." into msm-4.14 (1721ffd2) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/kernel/traps.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include <linux/mm_types.h>

		#include <asm/atomic.h>
		#include <asm/barrier.h>
		#include <asm/bug.h>
		#include <asm/debug-monitors.h>
		#include <asm/esr.h>
		@@ -502,6 +503,7 @@ static void cntvct_read_handler(unsigned int esr, struct pt_regs *regs)
		{
		int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;

		isb();
		pt_regs_write_reg(regs, rt, arch_counter_get_cntvct());
		regs->pc += 4;
		}