diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:39:00 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:39:00 -0300 |
| commit | c2167b6ceb0ac15eb770243e193ee56b0c786096 (patch) | |
| tree | abcae4800a7c5f143f25a27980e7d0966bd91066 | |
| parent | 77e2817e78b7c20d77a94256f5fcb31651001e8f (diff) | |
| download | FreeBSD-src-c2167b6ceb0ac15eb770243e193ee56b0c786096.zip FreeBSD-src-c2167b6ceb0ac15eb770243e193ee56b0c786096.tar.gz | |
Revert "Revert "MFC r322940:""
This reverts commit 72b499fe038338698da9878361ba68f79cd05af6.
| -rw-r--r-- | sys/amd64/amd64/cpu_switch.S | 2 | ||||
| -rw-r--r-- | sys/amd64/amd64/exception.S | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 552f481..a234d3ed 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -108,7 +108,7 @@ ENTRY(cpu_switch) movl %fs,%eax cmpl $KUF32SEL,%eax jne 1f - rdfsbaseq %rax + rdfsbase %rax movq %rax,PCB_FSBASE(%r8) 1: movl %gs,%eax cmpl $KUG32SEL,%eax diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index c288f3d..ebdf41a 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 - rdfsbaseq %rax + rdfsbase %rax 1: cmpw $KUG32SEL,TF_GS(%rsp) jne 2f - rdgsbaseq %rdx + rdgsbase %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 - rdfsbaseq %rax + rdfsbase %rax movq %rax,PCB_FSBASE(%rdi) 1: cmpw $KUG32SEL,TF_GS(%rsp) jne 2f |
