Module Name: src
Committed By: matt
Date: Sat Jul 30 06:20:54 UTC 2016
Modified Files:
src/sys/arch/mips/mips: vm_machdep.c
Log Message:
For LP64 and N32 make sure KX is set in the trapframe as well.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/mips/mips/vm_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/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.148 src/sys/arch/mips/mips/vm_machdep.c:1.149
--- src/sys/arch/mips/mips/vm_machdep.c:1.148 Sat Jul 30 05:58:15 2016
+++ src/sys/arch/mips/mips/vm_machdep.c Sat Jul 30 06:20:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.148 2016/07/30 05:58:15 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.149 2016/07/30 06:20:54 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.148 2016/07/30 05:58:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.149 2016/07/30 06:20:54 matt Exp $");
#include "opt_ddb.h"
#include "opt_coredump.h"
@@ -144,6 +144,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
pcb2->pcb_context.val[_L_RA] =
mips_locore_jumpvec.ljv_lwp_trampoline; /* RA */
#if defined(_LP64) || defined(__mips_n32)
+ KASSERT(tf->tf_regs[_R_SR] & MIPS_SR_KX);
KASSERT(pcb2->pcb_context.val[_L_SR] & MIPS_SR_KX);
#endif
KASSERTMSG(pcb2->pcb_context.val[_L_SR] & MIPS_SR_INT_IE,
