[Linux-mips-commits]CVS: linux/arch/mips/kernel proc.c,1.14,1.15

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv23733

Modified Files:
	proc.c 
Log Message:
Synced to OSS proc

Index: proc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/proc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- proc.c	15 Feb 2002 19:47:27 -0000	1.14
+++ proc.c	19 Feb 2002 18:13:00 -0000	1.15
@@ -60,14 +60,14 @@
 	[CPU_TX3922]	"TX3922",
 	[CPU_TX3927]	"TX3927",
         [CPU_AU1000]	"Au1000",
+	[CPU_AU1500]	"Au1500",
 	[CPU_4KEC]	"MIPS 4KEc",
 	[CPU_4KSC]	"MIPS 4KSc",
 	[CPU_VR41XX]	"NEC Vr41xx",
 	[CPU_R5500]	"R5500",
 	[CPU_TX49XX]	"TX49xx",
         [CPU_TX39XX]	"TX39xx",
-	[CPU_R5900]	"R5900",
-	[CPU_AU1500]	"Au1500"
+	[CPU_R5900]	"R5900"
 };
 
 
@@ -86,11 +86,8 @@
 	/*
 	 * For the first processor also print the system type
 	 */
-#if 0
 	if (n == 0)
 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-#endif
-	
 
 	seq_printf(m, "processor\t\t: %ld\n", n);
 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
@@ -105,6 +102,7 @@
 	seq_printf(m, "wait instruction\t: %s\n", cpu_wait ? "yes" : "no");
 	seq_printf(m, "microsecond timers\t: %s\n",
 	              (mips_cpu.options & MIPS_CPU_COUNTER) ? "yes" : "no");
+	seq_printf(m, "tlb_entries\t\t: %d\n", mips_cpu.tlbsize);
 	seq_printf(m, "extra interrupt vector\t: %s\n",
 	              (mips_cpu.options & MIPS_CPU_DIVEC) ? "yes" : "no");
 	seq_printf(m, "hardware watchpoint\t: %s\n",