-#define ALIGNBYTES32 (sizeof(INT32) - 1)\r
-#define ALIGN32(p) (((UINT32)(p) + ALIGNBYTES32) &~ALIGNBYTES32)\r
-\r
-#define PGSHIFT 12 /* LOG2(NBPG) */\r
-#define NBPG (1 << PGSHIFT) /* bytes/page */\r
-#define PGOFSET (NBPG-1) /* byte offset into page */\r
-#define NPTEPG (NBPG/(sizeof (pt_entry_t)))\r
-\r
-/*\r
- * XXXfvdl change this (after bootstrap) to take # of bits from\r
- * config info into account.\r
- */\r
-#define KERNBASE 0xffffffff80000000 /* start of kernel virtual space */\r
-#define KERNTEXTOFF 0xffffffff80100000 /* start of kernel text */\r
-#define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT)\r
-\r
-#define KERNTEXTOFF_HI 0xffffffff\r
-#define KERNTEXTOFF_LO 0x80100000\r
+#define ALIGNBYTES32 (sizeof(INT32) - 1)\r
+#define ALIGN32(p) (((UINT64)(p) + ALIGNBYTES32) &~ALIGNBYTES32)\r