diff options
| author | doc HD <doc.divxm@gmail.com> | 2018-03-07 10:05:53 +0300 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2018-03-07 10:05:53 +0300 |
| commit | 812962bfbf833dc214abda0dea8339d02bff3cd1 (patch) | |
| tree | 7384e312916e52a56610d321022d534251c0b0d4 /arch/arm64/kernel/process.c | |
| parent | 9faca91a45aca9b575f4bbee4ce2ce1681f4ce8f (diff) | |
| parent | 0de87126892e03146cf68b204056c48c45aec7a6 (diff) | |
Merge branch 'android-msm-marlin-3.18-oreo-mr1' of https://android.googlesource.com/kernel/msm into o8.1o8.1
Change-Id: I91a8b8fc5803aacafb3eb5e6cf35cfa1213ed3e4
Diffstat (limited to 'arch/arm64/kernel/process.c')
| -rw-r--r-- | arch/arm64/kernel/process.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 9d1fd515dd5..05e3585ec2f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -361,25 +361,18 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, static void tls_thread_switch(struct task_struct *next) { - unsigned long tpidr, tpidrro; - if (!is_compat_task()) { + unsigned long tpidr; asm("mrs %0, tpidr_el0" : "=r" (tpidr)); current->thread.tp_value = tpidr; } - if (is_compat_thread(task_thread_info(next))) { - tpidr = 0; - tpidrro = next->thread.tp_value; - } else { - tpidr = next->thread.tp_value; - tpidrro = 0; - } + if (is_compat_thread(task_thread_info(next))) + write_sysreg(next->thread.tp_value, tpidrro_el0); + else if (!arm64_kernel_unmapped_at_el0()) + write_sysreg(0, tpidrro_el0); - asm( - " msr tpidr_el0, %0\n" - " msr tpidrro_el0, %1" - : : "r" (tpidr), "r" (tpidrro)); + write_sysreg(next->thread.tp_value, tpidr_el0); } /* Restore the UAO state depending on next's addr_limit */ |