Module Name: src
Committed By: maxv
Date: Sun Feb 25 13:14:27 UTC 2018
Modified Files:
src/sys/arch/amd64/include: frameasm.h
Log Message:
Remove INTRENTRY_L, it's not used anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/include/frameasm.h
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/include/frameasm.h
diff -u src/sys/arch/amd64/include/frameasm.h:1.36 src/sys/arch/amd64/include/frameasm.h:1.37
--- src/sys/arch/amd64/include/frameasm.h:1.36 Thu Feb 22 10:42:11 2018
+++ src/sys/arch/amd64/include/frameasm.h Sun Feb 25 13:14:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: frameasm.h,v 1.36 2018/02/22 10:42:11 maxv Exp $ */
+/* $NetBSD: frameasm.h,v 1.37 2018/02/25 13:14:27 maxv Exp $ */
#ifndef _AMD64_MACHINE_FRAMEASM_H
#define _AMD64_MACHINE_FRAMEASM_H
@@ -150,23 +150,19 @@
#define SVS_LEAVE_ALTSTACK /* nothing */
#endif
-#define INTRENTRY_L(kernel_trap, usertrap) \
+#define INTRENTRY \
subq $TF_REGSIZE,%rsp ; \
INTR_SAVE_GPRS ; \
cld ; \
SMAP_ENABLE ; \
testb $SEL_UPL,TF_CS(%rsp) ; \
- je kernel_trap ; \
-usertrap ; \
+ je 98f ; \
SWAPGS ; \
SVS_ENTER ; \
movw %gs,TF_GS(%rsp) ; \
movw %fs,TF_FS(%rsp) ; \
movw %es,TF_ES(%rsp) ; \
- movw %ds,TF_DS(%rsp)
-
-#define INTRENTRY \
- INTRENTRY_L(98f,) ; \
+ movw %ds,TF_DS(%rsp) ; \
98:
#define INTRFASTEXIT \
