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 <>
2 files changed