Module Name: src
Committed By: matt
Date: Sat Jun 6 21:44:17 UTC 2015
Modified Files:
src/sys/arch/mips/cavium: octeon_cpunode.c
src/sys/arch/mips/mips: genassym.cf
Log Message:
Use ci_nmi_stack
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/cavium/octeon_cpunode.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mips/mips/genassym.cf
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/cavium/octeon_cpunode.c
diff -u src/sys/arch/mips/cavium/octeon_cpunode.c:1.2 src/sys/arch/mips/cavium/octeon_cpunode.c:1.3
--- src/sys/arch/mips/cavium/octeon_cpunode.c:1.2 Sat Jun 6 20:52:16 2015
+++ src/sys/arch/mips/cavium/octeon_cpunode.c Sat Jun 6 21:44:16 2015
@@ -250,7 +250,7 @@ cpu_cpunode_attach_common(device_t self,
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
Index: src/sys/arch/mips/mips/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.57 src/sys/arch/mips/mips/genassym.cf:1.58
--- src/sys/arch/mips/mips/genassym.cf:1.57 Sat Jun 6 04:36:15 2015
+++ src/sys/arch/mips/mips/genassym.cf Sat Jun 6 21:44:16 2015
@@ -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/proc.h>
include <sys/mbuf.h>
include <sys/mutex.h>
include <sys/cpu.h>
+include <sys/bitops.h>
include <uvm/uvm.h>
@@ -291,6 +292,8 @@ endif
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_SCHED IPL_SCHED
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)
