shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: arm64: Fix 4.9.114 merge

Browse Source 
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 c02433dd6d
("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 9dd9614f54
("arm64: ssbd: Introduce thread flag to control userspace mitigation").

Change-Id: I0d7b1161eb2b6691504a765d50e58d2c42936f80
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
(cherry picked from commit 0137ea2134c0baf935430eeee3a70a8b7a193450)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Amit Pundir
2018-08-01 10:20:28 +05:30
committed by Chris
parent 1623e5a260
commit da17e407d0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/entry.S
View File

@@ -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