Module Name: src
Committed By: maxv
Date: Fri Jul 14 13:21:29 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/compat/linux/arch/amd64: linux_machdep.c
Log Message:
Don't forget to clean l_md.md_flags, otherwise there may be MDL_COMPAT32,
in which case the kernel would always use iret (slower).
To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/linux/arch/amd64/linux_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/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.255 src/sys/arch/amd64/amd64/machdep.c:1.256
--- src/sys/arch/amd64/amd64/machdep.c:1.255 Fri Mar 24 17:09:36 2017
+++ src/sys/arch/amd64/amd64/machdep.c Fri Jul 14 13:21:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.255 2017/03/24 17:09:36 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.256 2017/07/14 13:21:29 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.255 2017/03/24 17:09:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.256 2017/07/14 13:21:29 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -1325,6 +1325,8 @@ setregs(struct lwp *l, struct exec_packa
l->l_proc->p_flag &= ~PK_32;
+ 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);
Index: src/sys/compat/linux/arch/amd64/linux_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.51 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.52
--- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.51 Mon Feb 13 15:03:18 2017
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c Fri Jul 14 13:21:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.51 2017/02/13 15:03:18 maxv Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.52 2017/07/14 13:21:29 maxv Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.51 2017/02/13 15:03:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.52 2017/07/14 13:21:29 maxv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -93,6 +93,8 @@ linux_setregs(struct lwp *l, struct exec
l->l_proc->p_flag &= ~PK_32;
+ l->l_md.md_flags = MDL_IRET;
+
tf = l->l_md.md_regs;
tf->tf_rax = 0;
tf->tf_rbx = 0;
