diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:17 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:17 -0400 |
| commit | 9966db25defba4e1dce263246db25237bc24479f (patch) | |
| tree | 5002f2849ebcceb57f40535798aa37dfbd841875 /arch/mips/kernel/proc.c | |
| parent | 36cfbaad815908f54872a7b471e9a7a09b4084a4 (diff) | |
[MIPS] Make facility to convert CPU types to strings generally available.
So far /proc/cpuinfo has been the only user but human readable processor
name are more useful than that for proc.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/proc.c')
| -rw-r--r-- | arch/mips/kernel/proc.c | 75 |
1 files changed, 1 insertions, 74 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index accd5201d0e1..efd2d1314123 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -17,78 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | unsigned int vced_count, vcei_count; | 18 | unsigned int vced_count, vcei_count; |
| 19 | 19 | ||
| 20 | static const char *cpu_name[] = { | ||
| 21 | [CPU_UNKNOWN] = "unknown", | ||
| 22 | [CPU_R2000] = "R2000", | ||
| 23 | [CPU_R3000] = "R3000", | ||
| 24 | [CPU_R3000A] = "R3000A", | ||
| 25 | [CPU_R3041] = "R3041", | ||
| 26 | [CPU_R3051] = "R3051", | ||
| 27 | [CPU_R3052] = "R3052", | ||
| 28 | [CPU_R3081] = "R3081", | ||
| 29 | [CPU_R3081E] = "R3081E", | ||
| 30 | [CPU_R4000PC] = "R4000PC", | ||
| 31 | [CPU_R4000SC] = "R4000SC", | ||
| 32 | [CPU_R4000MC] = "R4000MC", | ||
| 33 | [CPU_R4200] = "R4200", | ||
| 34 | [CPU_R4400PC] = "R4400PC", | ||
| 35 | [CPU_R4400SC] = "R4400SC", | ||
| 36 | [CPU_R4400MC] = "R4400MC", | ||
| 37 | [CPU_R4600] = "R4600", | ||
| 38 | [CPU_R6000] = "R6000", | ||
| 39 | [CPU_R6000A] = "R6000A", | ||
| 40 | [CPU_R8000] = "R8000", | ||
| 41 | [CPU_R10000] = "R10000", | ||
| 42 | [CPU_R12000] = "R12000", | ||
| 43 | [CPU_R14000] = "R14000", | ||
| 44 | [CPU_R4300] = "R4300", | ||
| 45 | [CPU_R4650] = "R4650", | ||
| 46 | [CPU_R4700] = "R4700", | ||
| 47 | [CPU_R5000] = "R5000", | ||
| 48 | [CPU_R5000A] = "R5000A", | ||
| 49 | [CPU_R4640] = "R4640", | ||
| 50 | [CPU_NEVADA] = "Nevada", | ||
| 51 | [CPU_RM7000] = "RM7000", | ||
| 52 | [CPU_RM9000] = "RM9000", | ||
| 53 | [CPU_R5432] = "R5432", | ||
| 54 | [CPU_4KC] = "MIPS 4Kc", | ||
| 55 | [CPU_5KC] = "MIPS 5Kc", | ||
| 56 | [CPU_R4310] = "R4310", | ||
| 57 | [CPU_SB1] = "SiByte SB1", | ||
| 58 | [CPU_SB1A] = "SiByte SB1A", | ||
| 59 | [CPU_TX3912] = "TX3912", | ||
| 60 | [CPU_TX3922] = "TX3922", | ||
| 61 | [CPU_TX3927] = "TX3927", | ||
| 62 | [CPU_AU1000] = "Au1000", | ||
| 63 | [CPU_AU1500] = "Au1500", | ||
| 64 | [CPU_AU1100] = "Au1100", | ||
| 65 | [CPU_AU1550] = "Au1550", | ||
| 66 | [CPU_AU1200] = "Au1200", | ||
| 67 | [CPU_4KEC] = "MIPS 4KEc", | ||
| 68 | [CPU_4KSC] = "MIPS 4KSc", | ||
| 69 | [CPU_VR41XX] = "NEC Vr41xx", | ||
| 70 | [CPU_R5500] = "R5500", | ||
| 71 | [CPU_TX49XX] = "TX49xx", | ||
| 72 | [CPU_20KC] = "MIPS 20Kc", | ||
| 73 | [CPU_24K] = "MIPS 24K", | ||
| 74 | [CPU_25KF] = "MIPS 25Kf", | ||
| 75 | [CPU_34K] = "MIPS 34K", | ||
| 76 | [CPU_74K] = "MIPS 74K", | ||
| 77 | [CPU_VR4111] = "NEC VR4111", | ||
| 78 | [CPU_VR4121] = "NEC VR4121", | ||
| 79 | [CPU_VR4122] = "NEC VR4122", | ||
| 80 | [CPU_VR4131] = "NEC VR4131", | ||
| 81 | [CPU_VR4133] = "NEC VR4133", | ||
| 82 | [CPU_VR4181] = "NEC VR4181", | ||
| 83 | [CPU_VR4181A] = "NEC VR4181A", | ||
| 84 | [CPU_SR71000] = "Sandcraft SR71000", | ||
| 85 | [CPU_BCM3302] = "Broadcom BCM3302", | ||
| 86 | [CPU_BCM4710] = "Broadcom BCM4710", | ||
| 87 | [CPU_PR4450] = "Philips PR4450", | ||
| 88 | [CPU_LOONGSON2] = "ICT Loongson-2", | ||
| 89 | }; | ||
| 90 | |||
| 91 | |||
| 92 | static int show_cpuinfo(struct seq_file *m, void *v) | 20 | static int show_cpuinfo(struct seq_file *m, void *v) |
| 93 | { | 21 | { |
| 94 | unsigned long n = (unsigned long) v - 1; | 22 | unsigned long n = (unsigned long) v - 1; |
| @@ -110,8 +38,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 110 | seq_printf(m, "processor\t\t: %ld\n", n); | 38 | seq_printf(m, "processor\t\t: %ld\n", n); |
| 111 | sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n", | 39 | sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n", |
| 112 | cpu_data[n].options & MIPS_CPU_FPU ? " FPU V%d.%d" : ""); | 40 | cpu_data[n].options & MIPS_CPU_FPU ? " FPU V%d.%d" : ""); |
| 113 | seq_printf(m, fmt, cpu_name[cpu_data[n].cputype <= CPU_LAST ? | 41 | seq_printf(m, fmt, __cpu_name[smp_processor_id()], |
| 114 | cpu_data[n].cputype : CPU_UNKNOWN], | ||
| 115 | (version >> 4) & 0x0f, version & 0x0f, | 42 | (version >> 4) & 0x0f, version & 0x0f, |
| 116 | (fp_vers >> 4) & 0x0f, fp_vers & 0x0f); | 43 | (fp_vers >> 4) & 0x0f, fp_vers & 0x0f); |
| 117 | seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n", | 44 | seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n", |