-extern vm_size_t page_size;
-extern vm_size_t page_mask;
-extern int page_shift;
-
-#ifndef PAGE_SIZE_FIXED
-#define PAGE_SIZE page_size /* pagesize in addr units */
-#define PAGE_SHIFT page_shift /* number of bits to shift for pages */
-#define PAGE_MASK page_mask /* mask for off in page */
-
-#define PAGE_SIZE_64 (unsigned long long)page_size /* pagesize in addr units */
-#define PAGE_MASK_64 (unsigned long long)page_mask /* mask for off in page */
-#else /* PAGE_SIZE_FIXED */
-
-#define PAGE_SIZE_64 (unsigned long long)4096
-#define PAGE_MASK_64 (PAGE_SIZE_64-1)
-#endif /* PAGE_SIZE_FIXED */
+#define PAGE_SIZE_64 (unsigned long long)PAGE_SIZE /* pagesize in addr units */
+#define PAGE_MASK_64 (unsigned long long)PAGE_MASK /* mask for off in page */