diff options
Diffstat (limited to 'sys/arch/powerpc/include')
| -rw-r--r-- | sys/arch/powerpc/include/db_machdep.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/kcore.h | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/pmap.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/pte.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/types.h | 5 |
5 files changed, 10 insertions, 13 deletions
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h index 9b491d237bc..241c7511fd6 100644 --- a/sys/arch/powerpc/include/db_machdep.h +++ b/sys/arch/powerpc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.20 2005/01/04 21:14:35 espie Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.21 2005/12/17 07:31:26 miod Exp $ */ /* $NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $ */ /* @@ -43,7 +43,7 @@ #define DB_ELF_SYMBOLS #define DB_ELFSIZE 32 -typedef vm_offset_t db_addr_t; /* address - unsigned */ +typedef vaddr_t db_addr_t; /* address - unsigned */ typedef long db_expr_t; /* expression - signed */ struct powerpc_saved_state { struct trapframe tf; diff --git a/sys/arch/powerpc/include/kcore.h b/sys/arch/powerpc/include/kcore.h index a85d9390d51..f3358751568 100644 --- a/sys/arch/powerpc/include/kcore.h +++ b/sys/arch/powerpc/include/kcore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kcore.h,v 1.3 2001/09/01 15:49:05 drahn Exp $ */ +/* $OpenBSD: kcore.h,v 1.4 2005/12/17 07:31:26 miod Exp $ */ /* $NetBSD: kcore.h,v 1.1 1996/09/30 16:34:26 ws Exp $ */ /*- @@ -38,8 +38,8 @@ #define NPHYS_RAM_SEGS 4 typedef struct cpu_kcore_hdr { - vm_offset_t ptable; /* Phys address of page table */ - vm_offset_t potable; /* Phys address of page overflow table */ + paddr_t ptable; /* Phys address of page table */ + paddr_t potable; /* Phys address of page overflow table */ phys_ram_seg_t ram_segs[NPHYS_RAM_SEGS]; } cpu_kcore_hdr_t; diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h index dafc5d78490..67e3c3967ae 100644 --- a/sys/arch/powerpc/include/pmap.h +++ b/sys/arch/powerpc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.40 2005/10/09 14:01:11 drahn Exp $ */ +/* $OpenBSD: pmap.h,v 1.41 2005/12/17 07:31:26 miod Exp $ */ /* $NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $ */ /*- @@ -129,7 +129,7 @@ void pmap_bootstrap(u_int kernelstart, u_int kernelend); void pmap_pinit(struct pmap *); void pmap_release(struct pmap *); -void pmap_real_memory(vm_offset_t *start, vm_size_t *size); +void pmap_real_memory(vaddr_t *start, vsize_t *size); void switchexit(struct proc *); int pte_spill_v(struct pmap *pm, u_int32_t va, u_int32_t dsisr, int exec_fault); diff --git a/sys/arch/powerpc/include/pte.h b/sys/arch/powerpc/include/pte.h index 3399c422619..652a66471bd 100644 --- a/sys/arch/powerpc/include/pte.h +++ b/sys/arch/powerpc/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.8 2005/10/03 02:18:50 drahn Exp $ */ +/* $OpenBSD: pte.h,v 1.9 2005/12/17 07:31:26 miod Exp $ */ /* $NetBSD: pte.h,v 1.1 1996/09/30 16:34:32 ws Exp $ */ /*- @@ -142,7 +142,7 @@ extern int ptab_cnt; #ifdef _KERNEL #ifndef _LOCORE extern u_int dsisr(void); -extern vm_offset_t dar(void); +extern vaddr_t dar(void); #endif /* _KERNEL */ #endif /* _LOCORE */ #endif /* _POWERPC_PTE_H_ */ diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h index 78be0235c50..06d6cd0736f 100644 --- a/sys/arch/powerpc/include/types.h +++ b/sys/arch/powerpc/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.1 1996/09/30 16:34:36 ws Exp $ */ -/* $OpenBSD: types.h,v 1.16 2005/12/14 21:46:31 millert Exp $ */ +/* $OpenBSD: types.h,v 1.17 2005/12/17 07:31:26 miod Exp $ */ /*- * Copyright (C) 1995 Wolfgang Solfrank. @@ -54,9 +54,6 @@ typedef unsigned long long uint64_t; typedef u_int32_t register_t; #if __BSD_VISIBLE -typedef unsigned long vm_size_t; -typedef unsigned long vm_offset_t; - typedef unsigned long vaddr_t; typedef unsigned long paddr_t; typedef unsigned long vsize_t; |