[LV-kern-commit] CVS: kernel-2.4/include/asm-vax/mm pagelet_pgprot.h,1.1,1.2 pagelet_pte.h,1.6,1.7

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv2202

Modified Files:
	pagelet_pgprot.h pagelet_pte.h 
Log Message:
page_chg_mask incorrectly defined, and pte_modify modified. Some things 
shifted about


Index: pagelet_pgprot.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pagelet_pgprot.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pagelet_pgprot.h	2001/02/15 01:17:23	1.1
+++ pagelet_pgprot.h	2001/08/31 11:53:29	1.2
@@ -56,10 +56,9 @@
 #define _PAGE_TABLE	(_PAGE_VALID |  _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_UW )
 #define _KERNPG_TABLE   (_PAGE_VALID | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_KW )
 
-/* UW has fewer bits set than UR */
-#define _PAGE_CHG_MASK	(_PFN_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_UR )
+#define _PAGE_CHG_MASK	(_PFN_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
 
-#define PAGE_PROT_MASK (0x1e000000)
+/*#define PAGE_PROT_MASK (0x1e000000)*/
 
 #define PAGE_NONE	__pgprot(_PAGE_VALID | _PAGE_ACCESSED)
 #define PAGE_SHARED	__pgprot(_PAGE_VALID | _PAGE_ACCESSED | _PAGE_UW )

Index: pagelet_pte.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pagelet_pte.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pagelet_pte.h	2001/07/31 17:33:26	1.6
+++ pagelet_pte.h	2001/08/31 11:53:29	1.7
@@ -149,7 +149,7 @@
  */ 
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 { 
-   pte_val(pte) &= PAGELET_MASK; 
+   pte_val(pte) &= _PAGE_CHG_MASK;
    pte_val(pte) |= pgprot_val(newprot);
    return pte; 
 }
@@ -242,6 +242,7 @@
    return pte; 
 }
 
+/* used in arch/vax/mm/pgalloc.c */
 static inline pte_t pte_mkinvalid(pte_t pte)        
 { 
    pte_val(pte) &= ~_PAGE_VALID;