diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-17 07:31:28 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-17 07:31:28 +0000 |
| commit | 7cbb57eba5664076170d755cd54b71d88b093c0e (patch) | |
| tree | ab7aa84468246c727fb48c0d639bf2567e2cf89f /sys/arch/cats | |
| parent | 9eee08e5579b1adf67335028b835e1df460fbb93 (diff) | |
Get rid of deprecated vm_{offset,size}_t types for good, use {p,v}{addr,size}_t
instead; looked at millert@
Diffstat (limited to 'sys/arch/cats')
| -rw-r--r-- | sys/arch/cats/cats/cats_machdep.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sys/arch/cats/cats/cats_machdep.c b/sys/arch/cats/cats/cats_machdep.c index 3bb7695d5d8..8395977f503 100644 --- a/sys/arch/cats/cats/cats_machdep.c +++ b/sys/arch/cats/cats/cats_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cats_machdep.c,v 1.11 2005/02/17 18:07:37 jfb Exp $ */ +/* $OpenBSD: cats_machdep.c,v 1.12 2005/12/17 07:31:25 miod Exp $ */ /* $NetBSD: cats_machdep.c,v 1.50 2003/10/04 14:28:28 chris Exp $ */ /* @@ -117,12 +117,11 @@ static char bootargs[MAX_BOOT_STRING + 1]; char *boot_args = NULL; char *boot_file = NULL; -vm_offset_t physical_start; -vm_offset_t physical_freestart; -vm_offset_t physical_freeend; -vm_offset_t physical_end; +paddr_t physical_start; +paddr_t physical_freestart; +paddr_t physical_freeend; +paddr_t physical_end; u_int free_pages; -vm_offset_t pagetables_start; int physmem = 0; /*int debug_flags;*/ @@ -137,7 +136,7 @@ pv_addr_t undstack; pv_addr_t abtstack; extern pv_addr_t kernelstack; -vm_offset_t msgbufphys; +paddr_t msgbufphys; extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; @@ -290,9 +289,9 @@ boot(howto) * time with section mappings. */ struct l1_sec_map { - vm_offset_t va; - vm_offset_t pa; - vm_size_t size; + vaddr_t va; + paddr_t pa; + vsize_t size; vm_prot_t prot; int cache; } l1_sec_table[] = { @@ -639,7 +638,7 @@ initarm(bootargs) /* Map the core memory needed before autoconfig */ loop = 0; while (l1_sec_table[loop].size) { - vm_size_t sz; + vsize_t sz; #ifdef VERBOSE_INIT_ARM printf("%08lx -> %08lx @ %08lx\n", l1_sec_table[loop].pa, |