Module Name: src
Committed By: mrg
Date: Sat Jan 23 16:06:57 UTC 2010
Modified Files:
src/sys/arch/sparc/sparc: cpu.c cpuvar.h
Log Message:
rename cpu_info{}::cpu_name member to cpu_longname, to avoid a potential
conflict
with <sys/cpu.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc/sparc/cpuvar.h
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/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.220 src/sys/arch/sparc/sparc/cpu.c:1.221
--- src/sys/arch/sparc/sparc/cpu.c:1.220 Sun Dec 20 03:42:29 2009
+++ src/sys/arch/sparc/sparc/cpu.c Sat Jan 23 16:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.220 2009/12/20 03:42:29 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.221 2010/01/23 16:06:57 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.220 2009/12/20 03:42:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.221 2010/01/23 16:06:57 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -348,7 +348,7 @@
/* Stuff to only run on the boot CPU */
cpu_setup();
snprintf(buf, sizeof buf, "%s @ %s MHz, %s FPU",
- cpi->cpu_name, clockfreq(cpi->hz), cpi->fpu_name);
+ cpi->cpu_longname, clockfreq(cpi->hz), cpi->fpu_name);
snprintf(cpu_model, sizeof cpu_model, "%s (%s)",
machine_model, buf);
printf(": %s\n", buf);
@@ -437,7 +437,7 @@
/* Now start this CPU */
cpu_spinup(cpi);
- printf(": %s @ %s MHz, %s FPU\n", cpi->cpu_name,
+ printf(": %s @ %s MHz, %s FPU\n", cpi->cpu_longname,
clockfreq(cpi->hz), cpi->fpu_name);
cache_print(sc);
@@ -1498,7 +1498,7 @@
* A cloaked Turbosparc: clear any items in cpuinfo that
* might have been set to uS2 versions during bootstrap.
*/
- sc->cpu_name = 0;
+ sc->cpu_longname = 0;
sc->mmu_ncontext = 0;
sc->cpu_type = 0;
sc->cacheinfo.c_vactype = 0;
@@ -1879,8 +1879,8 @@
/* Additional fixups */
mp->minfo->cpu_match(sc, mp->minfo, node);
}
- if (sc->cpu_name == 0)
- sc->cpu_name = mp->name;
+ if (sc->cpu_longname == 0)
+ sc->cpu_longname = mp->name;
if (sc->mmu_ncontext == 0)
sc->mmu_ncontext = mp->minfo->ncontext;
Index: src/sys/arch/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.82 src/sys/arch/sparc/sparc/cpuvar.h:1.83
--- src/sys/arch/sparc/sparc/cpuvar.h:1.82 Wed Jan 13 02:17:12 2010
+++ src/sys/arch/sparc/sparc/cpuvar.h Sat Jan 23 16:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.82 2010/01/13 02:17:12 mrg Exp $ */
+/* $NetBSD: cpuvar.h,v 1.83 2010/01/23 16:06:57 mrg Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -261,7 +261,7 @@
int mid; /* Module ID for MP systems */
int mbus; /* 1 if CPU is on MBus */
int mxcc; /* 1 if a MBus-level MXCC is present */
- const char *cpu_name; /* CPU model */
+ const char *cpu_longname; /* CPU model */
int cpu_impl; /* CPU implementation code */
int cpu_vers; /* CPU version code */
int mmu_impl; /* MMU implementation code */
