diff options
Diffstat (limited to 'sys/arch/macppc/include')
| -rw-r--r-- | sys/arch/macppc/include/powerpc.h | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/include/vmparam.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/macppc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h index 64dca7da010..8395bd297c0 100644 --- a/sys/arch/macppc/include/powerpc.h +++ b/sys/arch/macppc/include/powerpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: powerpc.h,v 1.7 2005/10/09 14:01:11 drahn Exp $ */ +/* $OpenBSD: powerpc.h,v 1.8 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 **); @@ -84,7 +84,7 @@ int ppc_intr_disable(void); struct dumpmem { vaddr_t start; - vm_size_t end; + vsize_t end; }; extern struct dumpmem dumpmem[VM_PHYSSEG_MAX]; extern u_int ndumpmem; diff --git a/sys/arch/macppc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h index 61d7274a860..ace57796122 100644 --- a/sys/arch/macppc/include/vmparam.h +++ b/sys/arch/macppc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.15 2005/04/11 15:13:01 deraadt Exp $ */ +/* $OpenBSD: vmparam.h,v 1.16 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_stolen 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) |