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

[Dave A. <ai...@us...>]

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

Modified Files:
	pagelet_pte.h 
Log Message:
DA: changes to mk_pte, creation of __mk_pte.. there is a FIXME in there
now... this code is ugly and need a cleanup


Index: pagelet_pte.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pagelet_pte.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pagelet_pte.h	2001/03/07 02:01:42	1.2
+++ pagelet_pte.h	2001/05/27 12:51:25	1.3
@@ -112,14 +112,16 @@
  * 
  *   See asm-i386/pgtable-3level.h for background.
  */
-
-static inline pte_t mk_pte(void *page, pgprot_t pgprot)
+/* D.A. May 2001 - FIXME: this needs cleaning up, hacked in a mk_pte and __mk_pte... will clean up later.. our mk_pte is being use incorrectly in some VAX code so I needed __mk_pte.
+ */
+static inline pte_t __mk_pte(void *page, pgprot_t pgprot)
 {
    	pte_t pte;
    	pte.pte = (__pa(page) >> PAGELET_SHIFT) | pgprot_val(pgprot);
    	return pte;
 }
 
+#define mk_pte(page, pgprot) __mk_pte(((page)-mem_map)<<PAGE_SHIFT,(pgprot))
 /* This takes a physical page address that is used by the remapping functions */
 static inline pte_t mk_pte_phys(void *physpage, pgprot_t pgprot)
 {