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

[Kenn H. <ke...@us...>]

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

Modified Files:
	pgcompat.h 
Log Message:
Bring over latter 2.2 changes

Index: pgcompat.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pgcompat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pgcompat.h	2001/01/18 15:52:28	1.2
--- pgcompat.h	2001/01/24 00:04:48	1.3
***************
*** 28,32 ****
  #include <asm/mm/vpage.h>
  
! #include <asm/mm/page.h>  /* for pte_t */
  
  #ifndef __ASSEMBLY__
--- 28,32 ----
  #include <asm/mm/vpage.h>
  
! #include <asm/page.h>  /* for pte_t */
  
  #ifndef __ASSEMBLY__
***************
*** 45,50 ****
  } vax_user_mm;
  
  /* macro to get linear page table entry for a physical address */
! #define GET_SPTE_PHYS(x)	 (pg0 + ((x) >> PAGE_SHIFT))
  
  /* macro to get linear page table entry for a virtual address 
--- 45,53 ----
  } vax_user_mm;
  
+ #define SPT_BASE ((pte_t*)(pgd_val(swapper_pg_dir[4])))
+ #define SPT_SIZE ((unsigned long)(pgd_val(swapper_pg_dir[5])))
+ 
  /* macro to get linear page table entry for a physical address */
! #define GET_SPTE_PHYS(x)	 (SPT_BASE + ((x) >> PAGE_SHIFT))
  
  /* macro to get linear page table entry for a virtual address 
***************
*** 54,58 ****
  /* macro to get the virtual address represented by an SPTE, given the
     address of the SPTE */
! #define SPTE_TO_VIRT(p)	      (void *)((((pte_t*)(p) - (pte_t*)pg0) << PAGE_SHIFT) + 0x80000000)
  
  // Temporary dumping ground. 
--- 57,61 ----
  /* macro to get the virtual address represented by an SPTE, given the
     address of the SPTE */
! #define SPTE_TO_VIRT(p)	      (void *)(( ((p) - SPT_BASE) << PAGE_SHIFT) + 0x80000000)
  
  // Temporary dumping ground.