diff --git a/[refs] b/[refs]
index e6f124420174..f16fde026886 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c1ce6f7c2aae5329f667fb079b3198266d9a3fa
+refs/heads/master: 3325732f3b223812e54ac67dbb0a8ea7c99cf519
diff --git a/trunk/arch/arm64/kernel/process.c b/trunk/arch/arm64/kernel/process.c
index 0337cdb0667b..c2cc2493481b 100644
--- a/trunk/arch/arm64/kernel/process.c
+++ b/trunk/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;
 }