Merge "arm64: issue isb when trapping CNTVCT_EL0 access" (2f26ea48) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm64/kernel/traps.c

+2 −0

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

		#include <asm/atomic.h>
		#include <asm/barrier.h>
		#include <asm/bug.h>
		#include <asm/debug-monitors.h>
		#include <asm/esr.h>
		@@ -453,6 +454,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();
		if (rt != 31)
		regs->regs[rt] = arch_counter_get_cntvct();
		regs->pc += 4;