--- zzzz-none-000/linux-2.4.17/arch/mips/lib/dump_tlb.c	2000-02-25 06:52:30.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/arch/mips/lib/dump_tlb.c	2004-11-24 13:22:38.000000000 +0000
@@ -11,12 +11,11 @@
 
 #include <asm/bootinfo.h>
 #include <asm/cachectl.h>
+#include <asm/cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 
-#define mips_tlb_entries 48
-
 void
 dump_tlb(int first, int last)
 {
@@ -77,7 +76,7 @@
 void
 dump_tlb_all(void)
 {
-	dump_tlb(0, mips_tlb_entries - 1);
+	dump_tlb(0, mips_cpu.tlbsize - 1);
 }
 
 void
@@ -125,7 +124,7 @@
 void
 dump_tlb_nonwired(void)
 {
-	dump_tlb(read_32bit_cp0_register(CP0_WIRED), mips_tlb_entries - 1);
+	dump_tlb(read_32bit_cp0_register(CP0_WIRED), mips_cpu.tlbsize - 1);
 }
 
 void
@@ -198,11 +197,9 @@
 {
 	int i;
 
-	for(i=0;i<8;i++)
-	{
-		printk("*%08lx == %08lx, ",
-		       (unsigned long)p, (unsigned long)*p++);
-		printk("*%08lx == %08lx\n",
-		       (unsigned long)p, (unsigned long)*p++);
+	for (i=0;i<8;i++) {
+		printk("*%08lx == %08lx, ", (unsigned long)p, p[0]);
+		printk("*%08lx == %08lx\n", (unsigned long)p, p[1]);
+		p += 2;
 	}
 }