Subject: [PATCH][2.6] VR41xx pte fix and VR413x cpu-probe fix

From: Dimitri Torfs <[email-masked]>
Date: Tue, 30 Dec 2003 21:24:29 +0100

Hi,

  here are two patches related to the VR41xx series. The first patch
  fixes the pte calculation (pte_pfn and pfn_pte) for VR41xx. Second
  patch fixes the cpu detection for the VR413x cpu's (missing break).

--- linux-mips-2.6.orig/include/asm-mips/pgtable-32.h	2003-10-19 02:50:11.000000000 +0200
+++ linux.work/include/asm-mips/pgtable-32.h	2003-12-30 20:36:19.000000000 +0100
@@ -131,8 +131,15 @@
 static inline void pgd_clear(pgd_t *pgdp)	{ }
 
 #define pte_page(x)		pfn_to_page(pte_pfn(x))
+
+
+#ifdef CONFIG_CPU_VR41XX
+#define pte_pfn(x)		((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))
+#define pfn_pte(pfn, prot)	__pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot))
+#else
 #define pte_pfn(x)		((unsigned long)((x).pte >> PAGE_SHIFT))
 #define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#endif
 
 #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)

--- linux-mips-2.6.orig/arch/mips/kernel/cpu-probe.c	2003-12-11 03:05:21.000000000 +0100
+++ linux.work/arch/mips/kernel/cpu-probe.c	2003-12-29 13:12:35.000000000 +0100
@@ -228,6 +228,7 @@
 				c->cputype = CPU_VR4131;
 			else
 				c->cputype = CPU_VR4133;
+			break;
 		default:
 			printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
 				c->cputype = CPU_VR41XX;

  Dimitri

-- 
Dimitri Torfs             |  NSCE 
[email-masked] |  Sint Stevens Woluwestraat 55
tel: +32 2 2908451        |  1130 Brussel
fax: +32 2 7262686        |  Belgium