1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 0337cdb0667b..c2cc2493481b 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -311,11 +311,11 @@ struct task_struct *__switch_to(struct task_struct *prev,
         fpsimd_thread_switch(next);
         tls_thread_switch(next);
         hw_breakpoint_thread_switch(next);
+        contextidr_thread_switch(next);
 
         /* the actual thread switch */
         last = cpu_switch_to(prev, next);
 
-        contextidr_thread_switch(next);
         return last;
 }