diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-05-08 12:22:58 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-05-08 12:22:58 -0300 |
| commit | 77c0e2e68638110a69edb20c8beaf1f288912b09 (patch) | |
| tree | 3e8b780ae0b551c955bb8e9b0296d5a93f3513fb /sys/amd64/amd64/cpu_switch.S | |
| parent | 2d610b9dd3fbae01c76c63d1ff563db29b0e79a3 (diff) | |
| parent | c0eaeb9c07bf0a6724d7ebb3ed64b4e3dfcd4d16 (diff) | |
| download | FreeBSD-src-77c0e2e68638110a69edb20c8beaf1f288912b09.zip FreeBSD-src-77c0e2e68638110a69edb20c8beaf1f288912b09.tar.gz | |
Merge remote-tracking branch 'origin/releng/11.1' into RELENG_2_4
Diffstat (limited to 'sys/amd64/amd64/cpu_switch.S')
| -rw-r--r-- | sys/amd64/amd64/cpu_switch.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 75599a5..952539f 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -214,10 +214,10 @@ do_kthread: done_tss: movq %r8,PCPU(RSP0) movq %r8,PCPU(CURPCB) - /* Update the TSS_RSP0 pointer for the next interrupt */ + /* Update the COMMON_TSS_RSP0 pointer for the next interrupt */ cmpb $0,pti(%rip) jne 1f - movq %r8,TSS_RSP0(%rdx) + movq %r8,COMMON_TSS_RSP0(%rdx) 1: movq %r12,PCPU(CURTHREAD) /* into next thread */ /* Test if debug registers should be restored. */ @@ -299,7 +299,7 @@ do_tss: movq %rdx,PCPU(TSSP) je 1f movq PCPU(PRVSPACE),%rax addq $PC_PTI_STACK+PC_PTI_STACK_SZ*8,%rax - movq %rax,TSS_RSP0(%rdx) + movq %rax,COMMON_TSS_RSP0(%rdx) 1: movl $TSSSEL,%eax ltr %ax jmp done_tss |
