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

• Lines: 38
• Date: Mon Aug 7 21:02:27 2000
• Orig file: v2.4.0-test5/linux/include/asm-m68k/pgtable.h
• Orig date: Thu Mar 2 14:36:23 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-m68k/pgtable.h linux/include/asm-m68k/pgtable.h
@@ -172,7 +172,7 @@
 
 #define BAD_PAGETABLE __bad_pagetable()
 #define BAD_PAGE __bad_page()
-#define ZERO_PAGE(vaddr)	(mem_map + MAP_NR(empty_zero_page))
+#define ZERO_PAGE(vaddr)	(virt_to_page(empty_zero_page))
 
 /* number of bits that fit into a memory pointer */
 #define BITS_PER_PTR			(8*sizeof(unsigned long))
@@ -192,7 +192,7 @@
 ({									\
 	pte_t __pte;							\
 									\
-	pte_val(__pte) = __pa((void *)page) + pgprot_val(pgprot);	\
+	pte_val(__pte) = __pa((page) + pgprot_val(pgprot);		\
 	__pte;								\
 })
 #define mk_pte(page, pgprot) __mk_pte(page_address(page), (pgprot))
@@ -228,7 +228,6 @@
 #define pte_none(pte)		(!pte_val(pte))
 #define pte_present(pte)	(pte_val(pte) & (_PAGE_PRESENT | _PAGE_FAKE_SUPER))
 #define pte_clear(ptep)		({ pte_val(*(ptep)) = 0; })
-#define pte_pagenr(pte)		((__pte_page(pte) - PAGE_OFFSET) >> PAGE_SHIFT)
 
 #define pmd_none(pmd)		(!pmd_val(pmd))
 #define pmd_bad(pmd)		((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE)
@@ -246,9 +245,9 @@
 #define pgd_clear(pgdp)		({ pgd_val(*pgdp) = 0; })
 
 /* Permanent address of a page. */
-#define page_address(page)	({ if (!(page)->virtual) BUG(); (page)->virtual; })
+#define page_address(page)	((page)->virtual)
 #define __page_address(page)	(PAGE_OFFSET + (((page) - mem_map) << PAGE_SHIFT))
-#define pte_page(pte)		(mem_map+pte_pagenr(pte))
+#define pte_page(pte)		(mem_map+((__pte_page(pte) - PAGE_OFFSET) >> PAGE_SHIFT))
 
 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), pte_val(e))