[src/trunk]: src/sys/arch/newsmips/apbus Avoid reference of APbus workarea th...

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

details:   https://anonhg.NetBSD.org/src/rev/e01278fe7a58
branches:  trunk
changeset: 836179:e01278fe7a58
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Sep 30 14:23:24 2018 +0000

description:
Avoid reference of APbus workarea that can't be read via kvm(3).

diffstat:

 sys/arch/newsmips/apbus/if_sn_ap.c  |  6 +++---
 sys/arch/newsmips/apbus/if_tlp_ap.c |  6 +++---
 sys/arch/newsmips/apbus/kb_ap.c     |  6 +++---
 sys/arch/newsmips/apbus/ms_ap.c     |  6 +++---
 sys/arch/newsmips/apbus/spifi.c     |  6 +++---
 sys/arch/newsmips/apbus/zs_ap.c     |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diffs (162 lines):

diff -r 54425641bb74 -r e01278fe7a58 sys/arch/newsmips/apbus/if_sn_ap.c
--- a/sys/arch/newsmips/apbus/if_sn_ap.c        Sun Sep 30 14:09:35 2018 +0000
+++ b/sys/arch/newsmips/apbus/if_sn_ap.c        Sun Sep 30 14:23:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sn_ap.c,v 1.11 2008/04/09 15:40:30 tsutsui Exp $    */
+/*     $NetBSD: if_sn_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $    */
 
 /*
  * Copyright (C) 1997 Allen Briggs
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn_ap.c,v 1.11 2008/04/09 15:40:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $");
 
 #include "opt_inet.h"
 
@@ -117,7 +117,7 @@
        apbus_intr_establish(0, /* interrupt level (0 or 1) */
            intrmask,
            0, /* priority */
-           snintr, sc, apa->apa_name, apa->apa_ctlnum);
+           snintr, sc, device_xname(self), apa->apa_ctlnum);
 }
 
 int
diff -r 54425641bb74 -r e01278fe7a58 sys/arch/newsmips/apbus/if_tlp_ap.c
--- a/sys/arch/newsmips/apbus/if_tlp_ap.c       Sun Sep 30 14:09:35 2018 +0000
+++ b/sys/arch/newsmips/apbus/if_tlp_ap.c       Sun Sep 30 14:23:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_ap.c,v 1.13 2011/07/15 07:49:20 he Exp $        */
+/*     $NetBSD: if_tlp_ap.c,v 1.14 2018/09/30 14:23:24 tsutsui Exp $   */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.13 2011/07/15 07:49:20 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.14 2018/09/30 14:23:24 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -222,7 +222,7 @@
        apbus_intr_establish(0, /* interrupt level (0 or 1) */
            intrmask,
            0, /* priority */
-           tlp_intr, sc, apa->apa_name, apa->apa_ctlnum);
+           tlp_intr, sc, device_xname(self), apa->apa_ctlnum);
 }
 
 static void
diff -r 54425641bb74 -r e01278fe7a58 sys/arch/newsmips/apbus/kb_ap.c
--- a/sys/arch/newsmips/apbus/kb_ap.c   Sun Sep 30 14:09:35 2018 +0000
+++ b/sys/arch/newsmips/apbus/kb_ap.c   Sun Sep 30 14:23:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kb_ap.c,v 1.10 2012/10/13 06:25:20 tsutsui Exp $       */
+/*     $NetBSD: kb_ap.c,v 1.11 2018/09/30 14:23:24 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.10 2012/10/13 06:25:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.11 2018/09/30 14:23:24 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,7 +144,7 @@
        reg->kb_tx_intr_en = 0;
 
        apbus_intr_establish(1, NEWS5000_INT1_KBD, 0, kb_ap_intr, sc,
-           "", apa->apa_ctlnum);
+           device_xname(self), apa->apa_ctlnum);
 
        waa.console = cons;
        waa.keymap = &kb_ap_keymapdata;
diff -r 54425641bb74 -r e01278fe7a58 sys/arch/newsmips/apbus/ms_ap.c
--- a/sys/arch/newsmips/apbus/ms_ap.c   Sun Sep 30 14:09:35 2018 +0000
+++ b/sys/arch/newsmips/apbus/ms_ap.c   Sun Sep 30 14:23:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ms_ap.c,v 1.11 2012/10/13 06:25:20 tsutsui Exp $       */
+/*     $NetBSD: ms_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.11 2012/10/13 06:25:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -101,7 +101,7 @@
        reg->ms_intr_en = 0;
 
        apbus_intr_establish(1, NEWS5000_INT1_KBD, 0, ms_ap_intr, sc,
-           "", apa->apa_ctlnum);
+           device_xname(self), apa->apa_ctlnum);
 
        aa.accessops = &ms_ap_accessops;
        aa.accesscookie = sc;
diff -r 54425641bb74 -r e01278fe7a58 sys/arch/newsmips/apbus/spifi.c
--- a/sys/arch/newsmips/apbus/spifi.c   Sun Sep 30 14:09:35 2018 +0000
+++ b/sys/arch/newsmips/apbus/spifi.c   Sun Sep 30 14:23:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spifi.c,v 1.18 2017/03/31 08:38:13 msaitoh Exp $       */
+/*     $NetBSD: spifi.c,v 1.19 2018/09/30 14:23:24 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spifi.c,v 1.18 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spifi.c,v 1.19 2018/09/30 14:23:24 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -206,7 +206,7 @@
                intr = NEWS5000_INT0_DMAC;
        else
                intr = SLOTTOMASK(apa->apa_slotno);
-       apbus_intr_establish(0, intr, 0, spifi_intr, sc, apa->apa_name,
+       apbus_intr_establish(0, intr, 0, spifi_intr, sc, device_xname(self),
            apa->apa_ctlnum);
 
        config_found(self, &sc->sc_channel, scsiprint);
diff -r 54425641bb74 -r e01278fe7a58 sys/arch/newsmips/apbus/zs_ap.c
--- a/sys/arch/newsmips/apbus/zs_ap.c   Sun Sep 30 14:09:35 2018 +0000
+++ b/sys/arch/newsmips/apbus/zs_ap.c   Sun Sep 30 14:23:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs_ap.c,v 1.27 2010/06/26 03:49:52 tsutsui Exp $       */
+/*     $NetBSD: zs_ap.c,v 1.28 2018/09/30 14:23:24 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ap.c,v 1.27 2010/06/26 03:49:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ap.c,v 1.28 2018/09/30 14:23:24 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -300,7 +300,7 @@
            (void (*)(void *))zsc_intr_soft, zsc);
        apbus_intr_establish(1, /* interrupt level ( 0 or 1 ) */
            NEWS5000_INT1_SCC, 0, /* priority */
-           zshard_ap, zsc, apa->apa_name, apa->apa_ctlnum);
+           zshard_ap, zsc, device_xname(self), apa->apa_ctlnum);
        /* XXX; evcnt_attach() ? */
 
 #if 0