[src/trunk]: src/sys/arch/mips/mips Add IPI_WDOG

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

details:   https://anonhg.NetBSD.org/src/rev/0506183176cc
branches:  trunk
changeset: 338728:0506183176cc
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 06 04:34:57 2015 +0000

description:
Add IPI_WDOG

diffstat:

 sys/arch/mips/mips/genassym.cf |  3 ++-
 sys/arch/mips/mips/ipifuncs.c  |  7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r cc3cd1ba0ba8 -r 0506183176cc sys/arch/mips/mips/genassym.cf
--- a/sys/arch/mips/mips/genassym.cf    Sat Jun 06 04:34:23 2015 +0000
+++ b/sys/arch/mips/mips/genassym.cf    Sat Jun 06 04:34:57 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.55 2015/06/02 05:10:57 matt Exp $
+#      $NetBSD: genassym.cf,v 1.56 2015/06/06 04:34:57 matt Exp $
 #
 # Copyright (c) 1992, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -284,6 +284,7 @@
 define CPU_INFO_CURLWP         offsetof(struct cpu_info, ci_curlwp)
 define CPU_INFO_IDLELWP        offsetof(struct cpu_info, ci_data.cpu_idlelwp)
 define CPU_INFO_EV_TLBMISSES   offsetof(struct cpu_info, ci_ev_tlbmisses.ev_count)
+define CPU_INFO_NMI_STACK      offsetof(struct cpu_info, ci_xnext)
 define CPU_INFO_PMAP_SEG0TAB   offsetof(struct cpu_info, ci_pmap_seg0tab)
 ifdef _LP64
 define CPU_INFO_PMAP_SEGTAB    offsetof(struct cpu_info, ci_pmap_segtab)
diff -r cc3cd1ba0ba8 -r 0506183176cc sys/arch/mips/mips/ipifuncs.c
--- a/sys/arch/mips/mips/ipifuncs.c     Sat Jun 06 04:34:23 2015 +0000
+++ b/sys/arch/mips/mips/ipifuncs.c     Sat Jun 06 04:34:57 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipifuncs.c,v 1.8 2015/04/14 22:36:53 jmcneill Exp $    */
+/*     $NetBSD: ipifuncs.c,v 1.9 2015/06/06 04:35:14 matt Exp $        */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.8 2015/04/14 22:36:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.9 2015/06/06 04:35:14 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -61,6 +61,7 @@
        [IPI_HALT]      = "ipi halt",
        [IPI_XCALL]     = "ipi xcall",
        [IPI_GENERIC]   = "ipi generic",
+       [IPI_WDOG]      = "ipi wdog",
 };
 
 static void
@@ -154,7 +155,7 @@
            NULL, device_xname(ci->ci_dev), "ipi");
 
        for (size_t i = 0; i < NIPIS; i++) {
-               KASSERT(ipi_names[i] != NULL);
+               KASSERTMSG(ipi_names[i] != NULL, "%zu", i);
                evcnt_attach_dynamic(&ci->ci_evcnt_per_ipi[i], EVCNT_TYPE_INTR,
                    NULL, device_xname(ci->ci_dev), ipi_names[i]);
        }