From: Xiongfeng Wang <wangxiongfeng2@huawei.com> Offering: HULK hulk inclusion category: feature bugzilla: 46790 CVE: NA -------------------------------- ARM erratum 1418040 only affect AARCH32. ILP32 is not affected. Signed-off-by: Xiongfeng Wang <wangxiongfeng2@hauwei.com> Acked-by: Xie XiuQi <xiexiuqi@huawei.com> Signed-off-by: Chen Jun <chenjun102@huawei.com> Conflicts: arch/arm64/kernel/process.c Signed-off-by: Chen Jiahao <chenjiahao16@huawei.com> --- arch/arm64/kernel/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 82f2754ed4b5..489810e3a7a1 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -484,7 +484,7 @@ static void erratum_1418040_thread_switch(struct task_struct *next) !this_cpu_has_cap(ARM64_WORKAROUND_1418040)) return; - if (is_compat_thread(task_thread_info(next))) + if (is_a32_compat_thread(task_thread_info(next))) sysreg_clear_set(cntkctl_el1, ARCH_TIMER_USR_VCT_ACCESS_EN, 0); else sysreg_clear_set(cntkctl_el1, 0, ARCH_TIMER_USR_VCT_ACCESS_EN); -- 2.34.1