===================================================================
RCS file: /cvs/prex-old/include/prex/bootinfo.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/include/prex/bootinfo.h	2008/06/03 10:38:44	1.1.1.1
+++ prex-old/include/prex/bootinfo.h	2008/08/13 17:12:27	1.1.1.1.2.1
@@ -46,11 +46,11 @@
 struct module
 {
 	char	name[16];	/* name of image */
-	u_long	phys;		/* physical address */
+	paddr_t	phys;		/* physical address */
 	size_t	size;		/* size of image */
-	u_long	entry;		/* entry address */
-	u_long	text;		/* text address */
-	u_long	data;		/* data address */
+	vaddr_t	entry;		/* entry address */
+	vaddr_t	text;		/* text address */
+	vaddr_t	data;		/* data address */
 	size_t	textsz;		/* text size */
 	size_t	datasz;		/* data size */
 	size_t	bsssz;		/* bss size */
@@ -61,7 +61,7 @@
  */
 struct mem_map
 {
-	u_long	start;		/* start address */
+	paddr_t	start;		/* start address */
 	size_t	size;		/* size in bytes */
 };
 
@@ -88,7 +88,7 @@
 	struct mem_map	reserved[NRESMEM];	/* system reserved memory */
 	struct mem_map	ram_disk;	/* ram disk image in memory */
 	struct mem_map	modules;	/* boot modules (kernel, driver, boot tasks) */
-	u_long		archive;	/* archive offset in memory */
+	paddr_t		archive;	/* archive offset in memory */
 	int		nr_tasks;	/* number of boot tasks */
 	struct module	kernel;		/* kernel image */
 	struct module	driver;		/* driver image */