[src/trunk]: src/sys/arch/mips rename pridtab{}::cpu_name to cpu_displayname.

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

details:   https://anonhg.NetBSD.org/src/rev/6a3a4858c71c
branches:  trunk
changeset: 751062:6a3a4858c71c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jan 23 15:55:54 2010 +0000

description:
rename pridtab{}::cpu_name to cpu_displayname.

should fix a build error reported by he@.

diffstat:

 sys/arch/mips/include/cpu.h       |   4 ++--
 sys/arch/mips/mips/mips_machdep.c |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 5c8dfeffedb4 -r 6a3a4858c71c sys/arch/mips/include/cpu.h
--- a/sys/arch/mips/include/cpu.h       Sat Jan 23 15:40:14 2010 +0000
+++ b/sys/arch/mips/include/cpu.h       Sat Jan 23 15:55:54 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.94 2009/12/14 00:46:04 matt Exp $    */
+/*     $NetBSD: cpu.h,v 1.95 2010/01/23 15:55:54 mrg Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -61,7 +61,7 @@
        int     cpu_flags;
        u_int   cpu_cp0flags;   /* presence of some cp0 regs */
        u_int   cpu_cidflags;   /* company-specific flags */
-       const char      *cpu_name;
+       const char      *cpu_displayname;
 };
 
 extern const struct pridtab *mycpu;
diff -r 5c8dfeffedb4 -r 6a3a4858c71c sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Sat Jan 23 15:40:14 2010 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Sat Jan 23 15:55:54 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.224 2009/12/15 18:24:47 matt Exp $  */
+/*     $NetBSD: mips_machdep.c,v 1.225 2010/01/23 15:55:54 mrg Exp $   */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.224 2009/12/15 18:24:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.225 2010/01/23 15:55:54 mrg Exp $");
 
 #include "opt_cputype.h"
 #include "opt_compat_netbsd32.h"
@@ -860,7 +860,7 @@
        curlwp = &lwp0;
 
        mycpu = NULL;
-       for (ct = cputab; ct->cpu_name != NULL; ct++) {
+       for (ct = cputab; ct->cpu_displayname != NULL; ct++) {
                if (MIPS_PRID_CID(cpu_id) != ct->cpu_cid ||
                    MIPS_PRID_IMPL(cpu_id) != ct->cpu_pid)
                        continue;
@@ -1095,13 +1095,13 @@
        const char *cpuname, *fpuname;
        int i;
 
-       cpuname = mycpu->cpu_name;
+       cpuname = mycpu->cpu_displayname;
 
        fpuname = NULL;
        for (i = 0; i < sizeof(fputab)/sizeof(fputab[0]); i++) {
                if (MIPS_PRID_CID(fpu_id) == fputab[i].cpu_cid &&
                    MIPS_PRID_IMPL(fpu_id) == fputab[i].cpu_pid) {
-                       fpuname = fputab[i].cpu_name;
+                       fpuname = fputab[i].cpu_displayname;
                        break;
                }
        }