Module Name: src
Committed By: mrg
Date: Wed Jan 13 02:17:12 UTC 2010
Modified Files:
src/sys/arch/sparc/sparc: cpuvar.h timer_sun4m.c
Log Message:
replace local ci_cpuname[] and use new cpu_name().
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc/sparc/cpuvar.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/sparc/timer_sun4m.c
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/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.81 src/sys/arch/sparc/sparc/cpuvar.h:1.82
--- src/sys/arch/sparc/sparc/cpuvar.h:1.81 Sun Dec 20 03:50:56 2009
+++ src/sys/arch/sparc/sparc/cpuvar.h Wed Jan 13 02:17:12 2010
@@ -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;
};
Index: src/sys/arch/sparc/sparc/timer_sun4m.c
diff -u src/sys/arch/sparc/sparc/timer_sun4m.c:1.21 src/sys/arch/sparc/sparc/timer_sun4m.c:1.22
--- src/sys/arch/sparc/sparc/timer_sun4m.c:1.21 Wed Jan 6 06:15:09 2010
+++ src/sys/arch/sparc/sparc/timer_sun4m.c Wed Jan 13 02:17:12 2010
@@ -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 */
