From 7cbb57eba5664076170d755cd54b71d88b093c0e Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Sat, 17 Dec 2005 07:31:28 +0000 Subject: Get rid of deprecated vm_{offset,size}_t types for good, use {p,v}{addr,size}_t instead; looked at millert@ --- sys/arch/mvmeppc/include/powerpc.h | 6 +++--- sys/arch/mvmeppc/include/vmparam.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/arch/mvmeppc/include') diff --git a/sys/arch/mvmeppc/include/powerpc.h b/sys/arch/mvmeppc/include/powerpc.h index 4b13a038867..2505e197b5e 100644 --- a/sys/arch/mvmeppc/include/powerpc.h +++ b/sys/arch/mvmeppc/include/powerpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: powerpc.h,v 1.4 2004/01/28 23:50:18 miod Exp $ */ +/* $OpenBSD: powerpc.h,v 1.5 2005/12/17 07:31:26 miod Exp $ */ /* $NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $ */ /* @@ -35,8 +35,8 @@ #define _MACHINE_POWERPC_H_ struct mem_region { - vm_offset_t start; - vm_size_t size; + vaddr_t start; + vsize_t size; }; void mem_regions(struct mem_region **, struct mem_region **); diff --git a/sys/arch/mvmeppc/include/vmparam.h b/sys/arch/mvmeppc/include/vmparam.h index 0304094be49..3f078c85b13 100644 --- a/sys/arch/mvmeppc/include/vmparam.h +++ b/sys/arch/mvmeppc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.14 2005/04/11 15:13:01 deraadt Exp $ */ +/* $OpenBSD: vmparam.h,v 1.15 2005/12/17 07:31:26 miod Exp $ */ /* $NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $ */ /*- @@ -75,15 +75,15 @@ /* * Would like to have MAX addresses = 0, but this doesn't (currently) work */ -#define VM_MIN_ADDRESS ((vm_offset_t)0) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0xfffff000) +#define VM_MIN_ADDRESS ((vaddr_t)0) +#define VM_MAXUSER_ADDRESS ((vaddr_t)0xfffff000) #define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)(PPC_KERNEL_SR << ADDR_SR_SHIFT)) +#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)(PPC_KERNEL_SR << ADDR_SR_SHIFT)) /* ppc_kvm_size is so that vm space can be stolen before vm is fully * initialized. */ -extern vm_offset_t ppc_kvm_stolen; +extern vaddr_t ppc_kvm_stolen; #define VM_KERN_ADDRESS_SIZE (PPC_SEGMENT_LENGTH - (32 * 1024 * 1024)) #define VM_MAX_KERNEL_ADDRESS (VM_MIN_KERNEL_ADDRESS + VM_KERN_ADDRESS_SIZE) -- cgit v1.2.3