[LV-k25-commit] CVS: kernel-2.5/include/asm-vax/mm pgtable.h,1.7,1.8

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

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm
In directory sc8-pr-cvs1:/tmp/cvs-serv15810/include/asm/mm

Modified Files:
	pgtable.h 
Log Message:
2.5.20 introduces an arch-independent swap entry layout on top of
the arch-dependent __swp_entry, __swp_type, etc macros.


Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pgtable.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pgtable.h	12 Dec 2002 01:19:21 -0000	1.7
+++ pgtable.h	16 Jan 2003 01:52:03 -0000	1.8
@@ -164,11 +164,11 @@
 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 
 /* Encode and de-code a swap entry */
-#define SWP_TYPE(x)			(((x).val >> 1) & 0x3f)
-#define SWP_OFFSET(x)			((x).val >> 8)
-#define SWP_ENTRY(type, offset)		((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
-#define pte_to_swp_entry(x)		((swp_entry_t) { pte_val(x) })
-#define swp_entry_to_pte(x)		((pte_t) { (x).val })
+#define __swp_type(x)			(((x).val >> 1) & 0x3f)
+#define __swp_offset(x)			((x).val >> 8)
+#define __swp_entry(type, offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
+#define __pte_to_swp_entry(x)		((swp_entry_t) { pte_val(x) })
+#define __swp_entry_to_pte(x)		((pte_t) { (x).val })
 
 /* Memory sizing.  You'll need to #include <asm/rpb.h> to get
  *     the declaration of boot_rpb. */