diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:21:29 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:21:29 -0300 |
| commit | d3d59b01294138e59995b31d2bcbbbdf45e26a3c (patch) | |
| tree | 11fbc866b8a4436698a543bf2dc20a8360bcf479 /sys/amd64/ia32/ia32_exception.S | |
| parent | 63302e53ed4b3fe59711d939ba87433a9a12199d (diff) | |
| download | FreeBSD-src-d3d59b01294138e59995b31d2bcbbbdf45e26a3c.zip FreeBSD-src-d3d59b01294138e59995b31d2bcbbbdf45e26a3c.tar.gz | |
Revert "MFC r328083,328096,328116,328119,328120,328128,328135,328153,328157,"
This reverts commit 430a2bea3907149b30cc75fc722b6cf1f81da82a.
Diffstat (limited to 'sys/amd64/ia32/ia32_exception.S')
| -rw-r--r-- | sys/amd64/ia32/ia32_exception.S | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S index 1f09764..fe1a676 100644 --- a/sys/amd64/ia32/ia32_exception.S +++ b/sys/amd64/ia32/ia32_exception.S @@ -40,27 +40,24 @@ * that it originated in supervisor mode and skip the swapgs. */ SUPERALIGN_TEXT -IDTVEC(int0x80_syscall_pti) - PTI_UENTRY has_err=0 - jmp int0x80_syscall_common - SUPERALIGN_TEXT IDTVEC(int0x80_syscall) swapgs -int0x80_syscall_common: pushq $2 /* sizeof "int 0x80" */ subq $TF_ERR,%rsp /* skip over tf_trapno */ movq %rdi,TF_RDI(%rsp) movq PCPU(CURPCB),%rdi andl $~PCB_FULL_IRET,PCB_FLAGS(%rdi) - SAVE_SEGS - movq %rax,TF_RAX(%rsp) - movq %rdx,TF_RDX(%rsp) - movq %rcx,TF_RCX(%rsp) - call handle_ibrs_entry + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) sti movq %rsi,TF_RSI(%rsp) + movq %rdx,TF_RDX(%rsp) + movq %rcx,TF_RCX(%rsp) movq %r8,TF_R8(%rsp) movq %r9,TF_R9(%rsp) + movq %rax,TF_RAX(%rsp) movq %rbx,TF_RBX(%rsp) movq %rbp,TF_RBP(%rsp) movq %r10,TF_R10(%rsp) |
