Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0137ea21 authored by Amit Pundir's avatar Amit Pundir
Browse files

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: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 52be3221

arch/arm64/include/asm/assembler.h

+0 −22
Original line number Diff line number Diff line
@@ -247,28 +247,6 @@ lr .req x30 // link register 
#endif

	.endm



	/*

	 * @dst: Result of per_cpu(sym, smp_processor_id())

	 * @sym: The name of the per-cpu variable

	 * @tmp: scratch register

	 */

	.macro adr_this_cpu, dst, sym, tmp

	adr_l	\dst, \sym

	mrs	\tmp, tpidr_el1

	add	\dst, \dst, \tmp

	.endm



	/*

	 * @dst: Result of READ_ONCE(per_cpu(sym, smp_processor_id()))

	 * @sym: The name of the per-cpu variable

	 * @tmp: scratch register

	 */

	.macro ldr_this_cpu dst, sym, tmp

	adr_l	\dst, \sym

	mrs	\tmp, tpidr_el1

	ldr	\dst, [\dst, \tmp]

	.endm



	/*

	 * @dst: Result of per_cpu(sym, smp_processor_id())

	 * @sym: The name of the per-cpu variable

arch/arm64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -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