diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-12 15:34:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-12 15:34:03 -0800 |
| commit | 2f26ea48fbdb91ebe936b6238f45005f45c47a7a (patch) | |
| tree | 956b0f1f94029c2f23d2ffe2233b8b57e13856de | |
| parent | 5d574072e3eea5a1d6c3a68c2b852488e84b8447 (diff) | |
| parent | 022df8a55a6696c38a7442299292fd0d4d22d39f (diff) | |
Merge "arm64: issue isb when trapping CNTVCT_EL0 access"
| -rw-r--r-- | arch/arm64/kernel/traps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 9ee50ed48132..f80faf3547c6 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -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; |