[src/trunk]: src/sys/arch/sparc/sparc replace local ci_cpuname[] and use new ...

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

details:   https://anonhg.NetBSD.org/src/rev/6043ca87a76a
branches:  trunk
changeset: 750756:6043ca87a76a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jan 13 02:17:12 2010 +0000

description:
replace local ci_cpuname[] and use new cpu_name().

diffstat:

 sys/arch/sparc/sparc/cpuvar.h      |   3 +--
 sys/arch/sparc/sparc/timer_sun4m.c |  10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r dfba7f4a44de -r 6043ca87a76a sys/arch/sparc/sparc/cpuvar.h
--- a/sys/arch/sparc/sparc/cpuvar.h     Wed Jan 13 01:57:17 2010 +0000
+++ b/sys/arch/sparc/sparc/cpuvar.h     Wed Jan 13 02:17:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuvar.h,v 1.81 2009/12/20 03:50:56 mrg Exp $ */
+/*     $NetBSD: cpuvar.h,v 1.82 2010/01/13 02:17:12 mrg Exp $ */
 
 /*
  *  Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -332,7 +332,6 @@
         */
        vaddr_t ci_free_sva1, ci_free_eva1, ci_free_sva2, ci_free_eva2;
 
-       char ci_cpuname[8];     /* "cpu/0", etc. */
        struct evcnt ci_lev10;
        struct evcnt ci_lev14;
 };
diff -r dfba7f4a44de -r 6043ca87a76a sys/arch/sparc/sparc/timer_sun4m.c
--- a/sys/arch/sparc/sparc/timer_sun4m.c        Wed Jan 13 01:57:17 2010 +0000
+++ b/sys/arch/sparc/sparc/timer_sun4m.c        Wed Jan 13 02:17:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer_sun4m.c,v 1.21 2010/01/06 06:15:09 mrg Exp $     */
+/*     $NetBSD: timer_sun4m.c,v 1.22 2010/01/13 02:17:12 mrg Exp $     */
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,12 +58,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.21 2010/01/06 06:15:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.22 2010/01/13 02:17:12 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/systm.h>
+#include <sys/cpu.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
@@ -257,9 +258,8 @@
 
        /* Install timer/statclock event counters, per cpu */
        for (CPU_INFO_FOREACH(n, cpi)) {
-               snprintf(cpi->ci_cpuname, sizeof(cpi->ci_cpuname), "cpu/%d", n);
-               evcnt_attach_dynamic(&cpi->ci_lev10, EVCNT_TYPE_INTR, NULL, cpi->ci_cpuname, "lev10");
-               evcnt_attach_dynamic(&cpi->ci_lev14, EVCNT_TYPE_INTR, NULL, cpi->ci_cpuname, "lev14");
+               evcnt_attach_dynamic(&cpi->ci_lev10, EVCNT_TYPE_INTR, NULL, cpu_name(cpi), "lev10");
+               evcnt_attach_dynamic(&cpi->ci_lev14, EVCNT_TYPE_INTR, NULL, cpu_name(cpi), "lev14");
        }
 
        /* Put processor counter in "timer" mode */