Author: andrew
Date: Wed Feb 10 10:28:33 2016
New Revision: 295466
URL: https://svnweb.freebsd.org/changeset/base/295466
Log:
Revert an arm64 change that sneaked in with r295464.
Modified:
head/sys/arm64/arm64/swtch.S
Modified: head/sys/arm64/arm64/swtch.S
==============================================================================
--- head/sys/arm64/arm64/swtch.S Wed Feb 10 09:40:45 2016
(r295465)
+++ head/sys/arm64/arm64/swtch.S Wed Feb 10 10:28:33 2016
(r295466)
@@ -129,6 +129,12 @@ END(cpu_throw)
* x3 to x7, x16 and x17 are caller saved
*/
ENTRY(cpu_switch)
+ /* Store the new curthread */
+ str x1, [x18, #PC_CURTHREAD]
+ /* And the new pcb */
+ ldr x4, [x1, #TD_PCB]
+ str x4, [x18, #PC_CURPCB]
+
/*
* Save the old context.
*/
@@ -168,15 +174,10 @@ ENTRY(cpu_switch)
mov x0, x19
#endif
- /* Store the new curthread */
- str x1, [x18, #PC_CURTHREAD]
-
/*
- * Restore the saved context and save it as the curpcb.
+ * Restore the saved context.
*/
ldr x4, [x1, #TD_PCB]
- str x4, [x18, #PC_CURPCB]
-
/*
* TODO: We may need to flush the cache here if switching
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
