Module Name: src
Committed By: maxv
Date: Tue Oct 17 07:48:10 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: locore.S machdep.c
Log Message:
Move %ds and %es into the GDT on 64bit LWPs.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/amd64/amd64/machdep.c
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/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.132 src/sys/arch/amd64/amd64/locore.S:1.133
--- src/sys/arch/amd64/amd64/locore.S:1.132 Tue Oct 17 07:33:44 2017
+++ src/sys/arch/amd64/amd64/locore.S Tue Oct 17 07:48:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.132 2017/10/17 07:33:44 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.133 2017/10/17 07:48:10 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -1284,7 +1284,7 @@ IDTVEC(syscall)
movw %es,TF_ES(%rsp)
movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
- movw $(LSEL(LUDATA_SEL, SEL_UPL)),TF_DS(%rsp)
+ movw $(GSEL(GUDATA_SEL, SEL_UPL)),TF_DS(%rsp)
STI(si)
do_syscall:
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.267 src/sys/arch/amd64/amd64/machdep.c:1.268
--- src/sys/arch/amd64/amd64/machdep.c:1.267 Sun Oct 15 13:34:24 2017
+++ src/sys/arch/amd64/amd64/machdep.c Tue Oct 17 07:48:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.267 2017/10/15 13:34:24 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.268 2017/10/17 07:48:10 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.267 2017/10/15 13:34:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.268 2017/10/17 07:48:10 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -1331,8 +1331,8 @@ setregs(struct lwp *l, struct exec_packa
l->l_md.md_flags = MDL_IRET;
tf = l->l_md.md_regs;
- tf->tf_ds = LSEL(LUDATA_SEL, SEL_UPL);
- tf->tf_es = LSEL(LUDATA_SEL, SEL_UPL);
+ tf->tf_ds = GSEL(GUDATA_SEL, SEL_UPL);
+ tf->tf_es = GSEL(GUDATA_SEL, SEL_UPL);
cpu_segregs64_zero(l);
tf->tf_rdi = 0;
tf->tf_rsi = 0;
