aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-08-10 17:20:07 +0100
committerMark Brown <broonie@kernel.org>2018-08-10 17:20:07 +0100
commit38f53ef7bce9f848946a2ad4874d715186e32144 (patch)
tree6a0b2f8943917b7f7626d69854414379632202e8
parentcf271c9a1e108672140e67fe1ef5c3d92d26092e (diff)
parent46f06340cd452f11f536f549d5c3b4b01c336cac (diff)
downloadlinux-linaro-stable-linux-linaro-lsk-v4.9-rt.tar.gz
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linaro-lsk-v4.9-rt
-rw-r--r--arch/arm64/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index ca7f996c8212..439f3c2de235 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