svn commit: r323488 - stable/11/sys/amd64/amd64
Ryan Libby
rlibby at FreeBSD.org
Tue Sep 12 06:31:55 UTC 2017
Author: rlibby
Date: Tue Sep 12 06:31:53 2017
New Revision: 323488
URL: https://svnweb.freebsd.org/changeset/base/323488
Log:
MFC r322940:
amd64: drop q suffix from rd[fg]sbase for gas compatibility
Modified:
stable/11/sys/amd64/amd64/cpu_switch.S
stable/11/sys/amd64/amd64/exception.S
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/amd64/amd64/cpu_switch.S
==============================================================================
--- stable/11/sys/amd64/amd64/cpu_switch.S Tue Sep 12 06:27:19 2017 (r323487)
+++ stable/11/sys/amd64/amd64/cpu_switch.S Tue Sep 12 06:31:53 2017 (r323488)
@@ -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
Modified: stable/11/sys/amd64/amd64/exception.S
==============================================================================
--- stable/11/sys/amd64/amd64/exception.S Tue Sep 12 06:27:19 2017 (r323487)
+++ stable/11/sys/amd64/amd64/exception.S Tue Sep 12 06:31:53 2017 (r323488)
@@ -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
More information about the svn-src-stable
mailing list