patch-2.4.0-test6 linux/include/asm-mips/pgtable.h

• Lines: 49
• Date: Mon Aug 7 21:02:27 2000
• Orig file: v2.4.0-test5/linux/include/asm-mips/pgtable.h
• Orig date: Mon Jul 10 16:47:26 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-mips/pgtable.h linux/include/asm-mips/pgtable.h
@@ -34,6 +34,8 @@
 extern void (*_flush_cache_sigtramp)(unsigned long addr);
 extern void (*_flush_page_to_ram)(struct page * page);
 
+#define flush_dcache_page(page)			do { } while (0)
+
 #define flush_cache_all()		_flush_cache_all()
 #define flush_cache_mm(mm)		_flush_cache_mm(mm)
 #define flush_cache_range(mm,start,end)	_flush_cache_range(mm,start,end)
@@ -46,7 +48,7 @@
 #define flush_icache_page(vma, page)					\
 do {									\
 	unsigned long addr;						\
-	addr = page_address(page);					\
+	addr = (unsigned long) page_address(page);			\
 	_flush_cache_page(vma, addr);					\
 } while (0)
 
@@ -214,7 +216,7 @@
 #define BAD_PAGETABLE __bad_pagetable()
 #define BAD_PAGE __bad_page()
 #define ZERO_PAGE(vaddr) \
-	(mem_map + MAP_NR(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask)))
+	(virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask)))
 
 /* number of bits that fit into a memory pointer */
 #define BITS_PER_PTR			(8*sizeof(unsigned long))
@@ -239,11 +241,6 @@
  * Conversion functions: convert a page and protection to a page entry,
  * and a page entry and page directory to the page they refer to.
  */
-extern inline unsigned long pte_page(pte_t pte)
-{
-	return PAGE_OFFSET + (pte_val(pte) & PAGE_MASK);
-}
-
 extern inline unsigned long pmd_page(pmd_t pmd)
 {
 	return pmd_val(pmd);
@@ -310,8 +307,7 @@
  * is simple.
  */
 #define page_address(page)	((page)->virtual)
-#define pte_pagenr(x)		((unsigned long)((pte_val(x) >> PAGE_SHIFT)))
-#define pte_page(x)		(mem_map+pte_pagenr(x))
+#define pte_page(x)		(mem_map+(unsigned long)((pte_val(x) >> PAGE_SHIFT)))
 
 /*
  * The following only work if pte_present() is true.