svn commit: r328153 - head/sys/amd64/amd64
John Baldwin
jhb at FreeBSD.org
Thu Jan 18 22:13:54 UTC 2018
Author: jhb
Date: Thu Jan 18 22:13:53 2018
New Revision: 328153
URL: https://svnweb.freebsd.org/changeset/base/328153
Log:
Remove two no-longer-used labels from the NMI interrupt handler.
Reviewed by: kib
Modified:
head/sys/amd64/amd64/exception.S
Modified: head/sys/amd64/amd64/exception.S
==============================================================================
--- head/sys/amd64/amd64/exception.S Thu Jan 18 22:13:31 2018 (r328152)
+++ head/sys/amd64/amd64/exception.S Thu Jan 18 22:13:53 2018 (r328153)
@@ -663,9 +663,8 @@ outofnmi:
cli
nocallchain:
#endif
- testl %ebx,%ebx
+ testl %ebx,%ebx /* %ebx == 0 => return to userland */
jnz doreti_exit
-nmi_kernelexit:
/*
* Put back the preserved MSR_GSBASE value.
*/
@@ -675,7 +674,6 @@ nmi_kernelexit:
shrq $32,%rdx
wrmsr
movq %r13,%cr3
-nmi_restoreregs:
RESTORE_REGS
addq $TF_RIP,%rsp
jmp doreti_iret
More information about the svn-src-head
mailing list