Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv16568
Modified Files:
pgtable.h
Log Message:
Make GET_{HW}SPTE_PHYS return the correct type
Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pgtable.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pgtable.h 2001/02/21 00:26:58 1.9
+++ pgtable.h 2001/03/07 02:02:30 1.10
@@ -51,13 +51,13 @@
* results,
*/
/* macro to get linear page table entry for a physical address */
-#define GET_HWSPTE_PHYS(x) (SPT_BASE + ((x) >> (PAGELET_SHIFT-SIZEOF_PTR_LOG2)))
-#define GET_SPTE_PHYS(x) (SPT_BASE + ((x) >> (PAGE_SHIFT-SIZEOF_PTE_LOG2)))
+#define GET_HWSPTE_PHYS(x) ((hwpte_t *)(SPT_BASE + ((x) >> (PAGELET_SHIFT-SIZEOF_PTR_LOG2))))
+#define GET_SPTE_PHYS(x) ((pte_t *)(SPT_BASE + ((x) >> (PAGE_SHIFT-SIZEOF_PTE_LOG2))))
/* macro to get linear page table entry for a virtual address
(only works for addresses in S0 space) */
#define GET_HWSPTE_VIRT(x) GET_HWSPTE_PHYS(((unsigned long)x) - PAGE_OFFSET)
-#define GET_SPTE_VIRT(x) GET_SPTE_PHYS(((unsigned long)x) - PAGE_OFFSET)
+#define GET_SPTE_VIRT(x) GET_SPTE_PHYS(((unsigned long)x) - PAGE_OFFSET)
/* macro to get the virtual address represented by an SPTE, given the
address of the SPTE */
#define SPTE_TO_VIRT(p) (void *)((((unsigned long)p - (unsigned long)swapper_pg_dir[2].br) << (PAGE_SHIFT-SIZEOF_PTE_LOG2)) + PAGE_OFFSET)
|
