patch-2.4.25 linux-2.4.25/include/asm-mips/pgtable-32.h

• Lines: 29
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/include/asm-mips/pgtable-32.h
• Orig date: 2003-08-25 04:44:44.000000000 -0700

diff -urN linux-2.4.24/include/asm-mips/pgtable-32.h linux-2.4.25/include/asm-mips/pgtable-32.h
@@ -5,15 +5,24 @@
  * traditional mips two-level paging structure:
  */
 
-#define PMD_SHIFT	22
-#define PTRS_PER_PTE	1024
-#define PTRS_PER_PMD	1
-#define PTRS_PER_PGD	1024
+#ifdef CONFIG_64BIT_PHYS_ADDR
+#define PGD_ORDER	1
+#define PTE_ORDER	0
+#else
 #define PGD_ORDER	0
+#define PTE_ORDER	0
+#endif
+
+#define PMD_SHIFT       (2 * PAGE_SHIFT - PTE_T_LOG2)
 
 #if !defined (_LANGUAGE_ASSEMBLY)
+#ifdef CONFIG_64BIT_PHYS_ADDR
+#define pte_ERROR(e) \
+	printk("%s:%d: bad pte %016Lx.\n", __FILE__, __LINE__, pte_val(e))
+#else
 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
+#endif
 #define pmd_ERROR(e) \
 	printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
 #define pgd_ERROR(e) \