Module Name: src
Committed By: maxv
Date: Fri Feb 9 08:54:12 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: amd64_trap.S
Log Message:
Don't restore segment registers when leaving NMIs. In nmitrap (and the
functions it later calls), we are not allowing the trap frame to change;
so the segregs don't change since we are running with interrupts disabled
and there is no rescheduling in this case.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amd64/amd64/amd64_trap.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/amd64_trap.S
diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.23 src/sys/arch/amd64/amd64/amd64_trap.S:1.24
--- src/sys/arch/amd64/amd64/amd64_trap.S:1.23 Sun Jan 21 11:21:40 2018
+++ src/sys/arch/amd64/amd64/amd64_trap.S Fri Feb 9 08:54:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amd64_trap.S,v 1.23 2018/01/21 11:21:40 maxv Exp $ */
+/* $NetBSD: amd64_trap.S,v 1.24 2018/02/09 08:54:11 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -162,8 +162,6 @@ IDTVEC(trap02)
SVS_LEAVE_ALTSTACK
.Lnmileave:
- movw TF_ES(%rsp),%es
- movw TF_DS(%rsp),%ds
INTR_RESTORE_GPRS
addq $TF_REGSIZE+16,%rsp
iretq
