diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:28:30 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:28:30 -0300 |
| commit | 72b499fe038338698da9878361ba68f79cd05af6 (patch) | |
| tree | 436ab8c0103f6500aed7e327f44dbd2fe61a2d80 /sys/amd64/amd64/exception.S | |
| parent | 4635c206cc4dfcc984a17067a62e67d75095c647 (diff) | |
| download | FreeBSD-src-72b499fe038338698da9878361ba68f79cd05af6.zip FreeBSD-src-72b499fe038338698da9878361ba68f79cd05af6.tar.gz | |
Revert "MFC r322940:"
This reverts commit a9197dec5d4dc4631abb11db58f5cc72ce0625fd.
Diffstat (limited to 'sys/amd64/amd64/exception.S')
| -rw-r--r-- | sys/amd64/amd64/exception.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index ebdf41a..c288f3d 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -340,10 +340,10 @@ prot_addrf: jz 2f cmpw $KUF32SEL,TF_FS(%rsp) jne 1f - rdfsbase %rax + rdfsbaseq %rax 1: cmpw $KUG32SEL,TF_GS(%rsp) jne 2f - rdgsbase %rdx + rdgsbaseq %rdx 2: swapgs movq PCPU(CURPCB),%rdi testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) @@ -533,7 +533,7 @@ nmi_fromuserspace: jz 2f cmpw $KUF32SEL,TF_FS(%rsp) jne 1f - rdfsbase %rax + rdfsbaseq %rax movq %rax,PCB_FSBASE(%rdi) 1: cmpw $KUG32SEL,TF_GS(%rsp) jne 2f |
