X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fmips%2Fkernel%2Fproc.c;h=36f06539824304db22bc8f67a97e2b6034470026;hb=326e2e1a59decc81bea052e8a8c6d75c63daa2db;hp=5ddc2e9deecf3cfa042976c33b9b932c7d27edbe;hpb=b643b0fdbc59cf6bbb086974b29d2571e9e9f646;p=linux-2.6

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 5ddc2e9dee..36f0653982 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -14,79 +14,9 @@
 #include <asm/cpu-features.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
-#include <asm/watch.h>
 
 unsigned int vced_count, vcei_count;
 
-static const char *cpu_name[] = {
-	[CPU_UNKNOWN]	= "unknown",
-	[CPU_R2000]	= "R2000",
-	[CPU_R3000]	= "R3000",
-	[CPU_R3000A]	= "R3000A",
-	[CPU_R3041]	= "R3041",
-	[CPU_R3051]	= "R3051",
-	[CPU_R3052]	= "R3052",
-	[CPU_R3081]	= "R3081",
-	[CPU_R3081E]	= "R3081E",
-	[CPU_R4000PC]	= "R4000PC",
-	[CPU_R4000SC]	= "R4000SC",
-	[CPU_R4000MC]	= "R4000MC",
-	[CPU_R4200]	= "R4200",
-	[CPU_R4400PC]	= "R4400PC",
-	[CPU_R4400SC]	= "R4400SC",
-	[CPU_R4400MC]	= "R4400MC",
-	[CPU_R4600]	= "R4600",
-	[CPU_R6000]	= "R6000",
-	[CPU_R6000A]	= "R6000A",
-	[CPU_R8000]	= "R8000",
-	[CPU_R10000]	= "R10000",
-	[CPU_R12000]	= "R12000",
-	[CPU_R14000]	= "R14000",
-	[CPU_R4300]	= "R4300",
-	[CPU_R4650]	= "R4650",
-	[CPU_R4700]	= "R4700",
-	[CPU_R5000]	= "R5000",
-	[CPU_R5000A]	= "R5000A",
-	[CPU_R4640]	= "R4640",
-	[CPU_NEVADA]	= "Nevada",
-	[CPU_RM7000]	= "RM7000",
-	[CPU_RM9000]	= "RM9000",
-	[CPU_R5432]	= "R5432",
-	[CPU_4KC]	= "MIPS 4Kc",
-	[CPU_5KC]	= "MIPS 5Kc",
-	[CPU_R4310]	= "R4310",
-	[CPU_SB1]	= "SiByte SB1",
-	[CPU_SB1A]	= "SiByte SB1A",
-	[CPU_TX3912]	= "TX3912",
-	[CPU_TX3922]	= "TX3922",
-	[CPU_TX3927]	= "TX3927",
-	[CPU_AU1000]	= "Au1000",
-	[CPU_AU1500]	= "Au1500",
-	[CPU_AU1100]	= "Au1100",
-	[CPU_AU1550]	= "Au1550",
-	[CPU_AU1200]	= "Au1200",
-	[CPU_4KEC]	= "MIPS 4KEc",
-	[CPU_4KSC]	= "MIPS 4KSc",
-	[CPU_VR41XX]	= "NEC Vr41xx",
-	[CPU_R5500]	= "R5500",
-	[CPU_TX49XX]	= "TX49xx",
-	[CPU_20KC]	= "MIPS 20Kc",
-	[CPU_24K]	= "MIPS 24K",
-	[CPU_25KF]	= "MIPS 25Kf",
-	[CPU_34K]	= "MIPS 34K",
-	[CPU_74K]	= "MIPS 74K",
-	[CPU_VR4111]	= "NEC VR4111",
-	[CPU_VR4121]	= "NEC VR4121",
-	[CPU_VR4122]	= "NEC VR4122",
-	[CPU_VR4131]	= "NEC VR4131",
-	[CPU_VR4133]	= "NEC VR4133",
-	[CPU_VR4181]	= "NEC VR4181",
-	[CPU_VR4181A]	= "NEC VR4181A",
-	[CPU_SR71000]	= "Sandcraft SR71000",
-	[CPU_PR4450]	= "Philips PR4450",
-};
-
-
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
 	unsigned long n = (unsigned long) v - 1;
@@ -108,8 +38,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	seq_printf(m, "processor\t\t: %ld\n", n);
 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
 	        cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
-	seq_printf(m, fmt, cpu_name[cpu_data[n].cputype <= CPU_LAST ?
-	                            cpu_data[n].cputype : CPU_UNKNOWN],
+	seq_printf(m, fmt, __cpu_name[smp_processor_id()],
 	                           (version >> 4) & 0x0f, version & 0x0f,
 	                           (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
 	seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",
@@ -131,6 +60,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 		      cpu_has_dsp ? " dsp" : "",
 		      cpu_has_mipsmt ? " mt" : ""
 		);
+	seq_printf(m, "shadow register sets\t: %d\n",
+		       cpu_data[n].srsets);
+	seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
 
 	sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
 	        cpu_has_vce ? "%u" : "not available");
@@ -158,7 +90,7 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 
-struct seq_operations cpuinfo_op = {
+const struct seq_operations cpuinfo_op = {
 	.start	= c_start,
 	.next	= c_next,
 	.stop	= c_stop,