[src/trunk]: src/sys/arch/arm/arm32 rename a local cpu_name structure member ...

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

details:   https://anonhg.NetBSD.org/src/rev/0f85413c58b2
branches:  trunk
changeset: 751063:0f85413c58b2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jan 23 15:58:13 2010 +0000

description:
rename a local cpu_name structure member to avoid potential conflict
with <sys/cpu.h>'s.

diffstat:

 sys/arch/arm/arm32/cpu.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 6a3a4858c71c -r 0f85413c58b2 sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Sat Jan 23 15:55:54 2010 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Sat Jan 23 15:58:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.71 2008/10/25 18:15:19 matt Exp $    */
+/*     $NetBSD: cpu.c,v 1.72 2010/01/23 15:58:13 mrg Exp $     */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.71 2008/10/25 18:15:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.72 2010/01/23 15:58:13 mrg Exp $");
 
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -285,7 +285,7 @@
 struct cpuidtab {
        u_int32_t       cpuid;
        enum            cpu_class cpu_class;
-       const char      *cpu_name;
+       const char      *cpu_classname;
        const char * const *cpu_steppings;
 };
 
@@ -488,7 +488,7 @@
                        steppingstr = cpuids[i].cpu_steppings[cpuid &
                            CPU_ID_REVISION_MASK],
                        sprintf(cpu_model, "%s%s%s (%s core)",
-                           cpuids[i].cpu_name,
+                           cpuids[i].cpu_classname,
                            steppingstr[0] == '*' ? "" : " ",
                            &steppingstr[steppingstr[0] == '*'],
                            cpu_classes[cpu_class].class_name);