diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-10 17:20:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-10 17:20:07 +0100 |
| commit | 38f53ef7bce9f848946a2ad4874d715186e32144 (patch) | |
| tree | 6a0b2f8943917b7f7626d69854414379632202e8 | |
| parent | cf271c9a1e108672140e67fe1ef5c3d92d26092e (diff) | |
| parent | 46f06340cd452f11f536f549d5c3b4b01c336cac (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.09-rt
| -rw-r--r-- | arch/arm64/kernel/entry.S | 2 |
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 |