diff options
Diffstat (limited to 'sys/amd64/amd64/exception.S')
| -rw-r--r-- | sys/amd64/amd64/exception.S | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 6471f9a3041c..7b6cde824203 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -34,8 +34,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include "opt_atpic.h" @@ -209,7 +207,7 @@ X\l: * alltraps_u/k entry points. * SWAPGS must be already performed by prologue, * if this is the first time in the kernel from userland. - * Reenable interrupts if they were enabled before the trap. + * Re-enable interrupts if they were enabled before the trap. * This approximates SDT_SYS386TGT on the i386 port. */ SUPERALIGN_TEXT @@ -514,7 +512,7 @@ prot_addrf: /* * Fast syscall entry point. We enter here with just our new %cs/%ss set, - * and the new privilige level. We are still running on the old user stack + * and the new privilege level. We are still running on the old user stack * pointer. We have to juggle a few things around to find our stack etc. * swapgs gives us access to our PCPU space only. * @@ -585,7 +583,7 @@ fast_syscall_common: jnz 4f /* Check for and handle AST's on return to userland. */ movq PCPU(CURTHREAD),%rax - testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) + cmpl $0,TD_AST(%rax) jne 3f call handle_ibrs_exit callq *mds_handler @@ -1089,7 +1087,7 @@ ENTRY(fork_trampoline) * and bintr, and only interrupt handlers between the labels bintr and * eintr. This is implemented (partly) by including files that contain * some of the handlers. Before including the files, set up a normal asm - * environment so that the included files doen't need to know that they are + * environment so that the included files doesn't need to know that they are * included. */ @@ -1141,7 +1139,7 @@ doreti_ast: */ cli movq PCPU(CURTHREAD),%rax - testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) + cmpl $0,TD_AST(%rax) je doreti_exit sti movq %rsp,%rdi /* pass a pointer to the trapframe */ |