* x86_64/locore.S: fix PUSH_FSGS -> _ISR and always make room for
fsgsbase on a 64-bit kernel.
---
x86_64/locore.S | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/x86_64/locore.S b/x86_64/locore.S
index a782ec8a..d456b06b 100644
--- a/x86_64/locore.S
+++ b/x86_64/locore.S
@@ -446,11 +446,9 @@ push_fs:
pushq %fs /* restore fs, */
push_gs:
pushq %gs /* restore gs. */
-#ifdef USER32
push_gsbase:
pushq $0
pushq $0
-#endif
push_segregs:
movq %rax,R_TRAPNO(%rsp) /* set trap number */
movq %rdx,R_ERR(%rsp) /* set error code */
@@ -873,7 +871,7 @@ ast_from_interrupt:
push %rdx
mov %es,%rdx
push %rdx
- PUSH_FSGS
+ PUSH_FSGS_ISR
mov %ss,%dx /* switch to kernel segments */
mov %dx,%ds
--
2.30.2
