diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2018-01-08 14:30:25 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2018-01-08 14:30:25 -0800 |
| commit | a324f38b392c75ae0077d9e5623c8854bf0a5935 (patch) | |
| tree | 5cf2fb2b4ab92efdd1ac4fbd992dc7046ecbf955 | |
| parent | 8b8f9163905e71ad897e15ff2bc505dc77b96172 (diff) | |
| parent | b328e524c85af8e72a34ae8fbef9bdc363d6f84a (diff) | |
Merge remote-tracking branch 'common/android-4.9' into hikey-4.9
Change-Id: I619e151ec4687c169e6a0b3b6eed2395c5f2ecfc
| -rw-r--r-- | arch/arm64/kernel/entry.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index c1ff0999045e..3448a6250ac2 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -954,7 +954,9 @@ __ni_sys_trace: tramp_map_kernel x30 #ifdef CONFIG_RANDOMIZE_BASE adr x30, tramp_vectors + PAGE_SIZE -alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 +#ifndef CONFIG_ARCH_MSM8996 + isb +#endif ldr x30, [x30] #else ldr x30, =vectors |