|
@@ -370,16 +370,14 @@ void tls_preserve_current_state(void)
|
|
|
|
|
|
static void tls_thread_switch(struct task_struct *next)
|
|
|
{
|
|
|
- unsigned long tpidr, tpidrro;
|
|
|
-
|
|
|
tls_preserve_current_state();
|
|
|
|
|
|
- tpidr = *task_user_tls(next);
|
|
|
- tpidrro = is_compat_thread(task_thread_info(next)) ?
|
|
|
- next->thread.tp_value : 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);
|
|
|
|
|
|
- write_sysreg(tpidr, tpidr_el0);
|
|
|
- write_sysreg(tpidrro, tpidrro_el0);
|
|
|
+ write_sysreg(*task_user_tls(next), tpidr_el0);
|
|
|
}
|
|
|
|
|
|
/* Restore the UAO state depending on next's addr_limit */
|