Page MenuHomeFreeBSD
Files F160150865

D9593.diff
No OneTemporary
Actions

D9593.diff
View Options

Index: head/sys/arm64/arm64/swtch.S
===================================================================
--- head/sys/arm64/arm64/swtch.S
+++ head/sys/arm64/arm64/swtch.S
@@ -241,11 +241,6 @@
mov fp, #0 /* Stack traceback stops here. */
bl _C_LABEL(fork_exit)
- /* Restore sp and lr */
- ldp x0, x1, [sp]
- msr sp_el0, x0
- mov lr, x1
-
/* Restore the registers other than x0 and x1 */
ldp x2, x3, [sp, #TF_X + 2 * 8]
ldp x4, x5, [sp, #TF_X + 4 * 8]
@@ -261,14 +256,18 @@
ldp x24, x25, [sp, #TF_X + 24 * 8]
ldp x26, x27, [sp, #TF_X + 26 * 8]
ldp x28, x29, [sp, #TF_X + 28 * 8]
- /* Skip x30 as it was restored above as lr */
/*
* Disable interrupts to avoid
- * overwriting spsr_el1 by an IRQ exception.
+ * overwriting spsr_el1 and sp_el0 by an IRQ exception.
*/
msr daifset, #2
+ /* Restore sp and lr */
+ ldp x0, x1, [sp]
+ msr sp_el0, x0
+ mov lr, x1
+
/* Restore elr and spsr */
ldp x0, x1, [sp, #16]
msr elr_el1, x0

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 22, 7:15 PM (2 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34206194
Default Alt Text
D9593.diff (961 B)

Event Timeline