[src/trunk]: src/sys/arch/mips Use ci_nmi_stack

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

details:   https://anonhg.NetBSD.org/src/rev/4c4faf0ee0f2
branches:  trunk
changeset: 808896:4c4faf0ee0f2
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 06 21:44:16 2015 +0000

description:
Use ci_nmi_stack

diffstat:

 sys/arch/mips/cavium/octeon_cpunode.c |  2 +-
 sys/arch/mips/mips/genassym.cf        |  8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 7c0e6fa5c786 -r 4c4faf0ee0f2 sys/arch/mips/cavium/octeon_cpunode.c
--- a/sys/arch/mips/cavium/octeon_cpunode.c     Sat Jun 06 21:38:47 2015 +0000
+++ b/sys/arch/mips/cavium/octeon_cpunode.c     Sat Jun 06 21:44:16 2015 +0000
@@ -250,7 +250,7 @@
        KASSERT(pg != NULL);
        const vaddr_t kva = mips_pmap_map_poolpage(VM_PAGE_TO_PHYS(pg));
        KASSERT(kva != 0);
-       ci->ci_xnext = (void *)(kva + PAGE_SIZE - sizeof(struct kernframe));
+       ci->ci_nmi_stack = (void *)(kva + PAGE_SIZE - sizeof(struct kernframe));
 #endif
 
 #ifdef WDOG
diff -r 7c0e6fa5c786 -r 4c4faf0ee0f2 sys/arch/mips/mips/genassym.cf
--- a/sys/arch/mips/mips/genassym.cf    Sat Jun 06 21:38:47 2015 +0000
+++ b/sys/arch/mips/mips/genassym.cf    Sat Jun 06 21:44:16 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.57 2015/06/06 04:36:15 matt Exp $
+#      $NetBSD: genassym.cf,v 1.58 2015/06/06 21:44:16 matt Exp $
 #
 # Copyright (c) 1992, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -80,6 +80,7 @@
 include <sys/mbuf.h>
 include <sys/mutex.h>
 include <sys/cpu.h>
+include <sys/bitops.h>
 
 include <uvm/uvm.h>
 
@@ -291,6 +292,8 @@
 define CPU_INFO_DIVISOR_DELAY  offsetof(struct cpu_info, ci_divisor_delay)
 define CPU_INFO_MTX_COUNT      offsetof(struct cpu_info, ci_mtx_count)
 define CPU_INFO_MTX_OLDSPL     offsetof(struct cpu_info, ci_mtx_oldspl)
+define CPU_INFO_NMI_STACK      offsetof(struct cpu_info, ci_nmi_stack)
+
 ifdef MULTIPROCESSOR
 define CPU_INFO_FLAGS          offsetof(struct cpu_info, ci_flags)
 define CPU_INFO_KSP_TLB_SLOT   offsetof(struct cpu_info, ci_ksp_tlb_slot)
@@ -308,6 +311,9 @@
 define IPL_DDB                 IPL_DDB
 define IPL_HIGH                IPL_HIGH
 
+define V_MIPS3_SR_SR           ilog2(MIPS3_SR_SR)
+define V_MIPS_SR_BEV           ilog2(MIPS_SR_BEV)
+
 ifdef __HAVE_PREEMPTION
 define __HAVE_PREEMPTION       1
 define CPU_INFO_SOFTINTS       offsetof(struct cpu_info, ci_softints)