[src/trunk]: src/sys/arch/mips/mips For LP64 and N32 make sure KX is set in t...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b5383ba73bf
branches:  trunk
changeset: 346721:9b5383ba73bf
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jul 30 06:20:54 2016 +0000

description:
For LP64 and N32 make sure KX is set in the trapframe as well.

diffstat:

 sys/arch/mips/mips/vm_machdep.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r fb8a6a6458f7 -r 9b5383ba73bf sys/arch/mips/mips/vm_machdep.c
--- a/sys/arch/mips/mips/vm_machdep.c   Sat Jul 30 06:20:14 2016 +0000
+++ b/sys/arch/mips/mips/vm_machdep.c   Sat Jul 30 06:20:54 2016 +0000
@@ -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 @@
        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,