diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:39:29 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:39:29 -0300 |
| commit | 1fa1822747e2c7a1ce0c52949094a41570573fb4 (patch) | |
| tree | 89ac4a4db3991c587ae1e3f6b63ef22a93923bd2 | |
| parent | f2afa83fb9c064292249a3632647be4ea982abc9 (diff) | |
| download | FreeBSD-src-1fa1822747e2c7a1ce0c52949094a41570573fb4.zip FreeBSD-src-1fa1822747e2c7a1ce0c52949094a41570573fb4.tar.gz | |
Revert "Revert "MFC r327817:""
This reverts commit 671279ad5be3f1feb75857cf032daae1f04972dd.
| -rw-r--r-- | sys/amd64/amd64/cpu_switch.S | 2 | ||||
| -rw-r--r-- | sys/amd64/amd64/genassym.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 56dbc75..6e4ed35 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -215,7 +215,7 @@ done_tss: movq %r8,PCPU(RSP0) movq %r8,PCPU(CURPCB) /* Update the TSS_RSP0 pointer for the next interrupt */ - movq %r8,COMMON_TSS_RSP0(%rdx) + movq %r8,TSS_RSP0(%rdx) movq %r12,PCPU(CURTHREAD) /* into next thread */ /* Test if debug registers should be restored. */ diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index d087fdc..d32db56 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -157,7 +157,7 @@ ASSYM(PCB_FULL_IRET, PCB_FULL_IRET); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); -ASSYM(COMMON_TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); +ASSYM(TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); ASSYM(TF_R15, offsetof(struct trapframe, tf_r15)); ASSYM(TF_R14, offsetof(struct trapframe, tf_r14)); |
