On 06/06/2015 22:44, Matt Thomas wrote:
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
+#if NWDOG > 0 || defined(DDB)
+ void **nmi_vector = (void *)MIPS_PHYS_TO_KSEG0(0x800 +
32*ci->ci_cpuid);
+ *nmi_vector = octeon_reset_vector;
+
+ struct vm_page * const pg = mips_pmap_alloc_poolpage(UVM_PGA_ZERO);
+ 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));
+#endif
octeon_reset_vector is only available for MULTIPROCESSOR, so this fails
to link.
