From da17e407d08786ee89cddf5063006bfe343af578 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 1 Aug 2018 10:20:28 +0530 Subject: [PATCH] ANDROID: arm64: Fix 4.9.114 merge 4.9.114 merge commit introduced multiple definition of "adr_this_cpu" and "ldr_this_cpu" macros. So remove the duplicates added in Change-Id: I3f40a2dd358eca3bc19dde562e77a990bbfe72e9 ("UPSTREAM: arm64: assembler: introduce ldr_this_cpu"). Also android-4.9 has upstream commit c02433dd6de3 ("BACKPORT: arm64: split thread_info from task stack") backported, which renamed all TI_FLAGS to TSK_TI_FLAGS, hence fix LTS backport of upstream commit 9dd9614f5476 ("arm64: ssbd: Introduce thread flag to control userspace mitigation"). Change-Id: I0d7b1161eb2b6691504a765d50e58d2c42936f80 Signed-off-by: Amit Pundir (cherry picked from commit 0137ea2134c0baf935430eeee3a70a8b7a193450) Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 9d7ebd32e23a..3530d705ae05 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -107,7 +107,7 @@ alternative_cb arm64_enable_wa2_handling alternative_cb_end ldr_this_cpu \tmp2, arm64_ssbd_callback_required, \tmp1 cbz \tmp2, \targ - ldr \tmp2, [tsk, #TI_FLAGS] + ldr \tmp2, [tsk, #TSK_TI_FLAGS] tbnz \tmp2, #TIF_SSBD, \targ mov w0, #ARM_SMCCC_ARCH_WORKAROUND_2 mov w1, #\state