diff options
Diffstat (limited to 'sys/arch/mvme88k/include/pmap.h')
-rw-r--r-- | sys/arch/mvme88k/include/pmap.h | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h index 66d70af13b1..5d7676c26f0 100644 --- a/sys/arch/mvme88k/include/pmap.h +++ b/sys/arch/mvme88k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.10 2001/01/12 07:29:27 smurph Exp $ */ +/* $OpenBSD: pmap.h,v 1.11 2001/01/13 05:18:59 smurph Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University @@ -67,29 +67,20 @@ typedef struct pv_entry { vm_offset_t va; /* virtual address for mapping */ } *pv_entry_t; -#include <vm/vm.h> +#ifdef _KERNEL -#define PMAP_ACTIVATE(pmap, th, my_cpu) _pmap_activate(pmap, th, my_cpu) -#define PMAP_DEACTIVATE(pmap, th, my_cpu) _pmap_deactivate(pmap, th, my_cpu) - -#define PMAP_CONTEXT(pmap, thread) +extern struct pmap kernel_pmap_store; +#define pmap_kernel() (&kernel_pmap_store) #define pmap_resident_count(pmap) ((pmap)->stats.resident_count) - /* Used in builtin/device_pager.c */ #define pmap_phys_address(frame) ((vm_offset_t) (M88K_PTOB(frame))) - /* Used in kern/mach_timedev.c */ #define pmap_phys_to_frame(phys) ((int) (M88K_BTOP(phys))) -/* - * Since Our PCB has no infomation about the mapping, - * we have nothing to do in PMAP_PCB_INITIALIZE. - * XXX - */ -/* Used in machine/pcb.c */ -#define PMAP_PCB_INITIALIZE(x) - +#define PMAP_ACTIVATE(proc) pmap_activate(proc) +#define PMAP_DEACTIVATE(proc) pmap_deactivate(proc) +#define PMAP_CONTEXT(pmap, thread) /* * Modes used when calling pmap_cache_fulsh(). */ @@ -104,8 +95,6 @@ typedef struct pv_entry { /*** Prototypes for public functions defined in pmap.c ********************/ /**************************************************************************/ -void _pmap_activate(pmap_t pmap, pcb_t, int my_cpu); -void _pmap_deactivate(pmap_t pmap, pcb_t, int my_cpu); void pmap_activate(struct proc *p); void pmap_deactivate(struct proc *p); int pmap_check_transaction(pmap_t pmap, vm_offset_t va, vm_prot_t type); @@ -123,15 +112,6 @@ vm_offset_t pmap_map_batc( vm_prot_t prot, unsigned cmode); -#ifdef JUNK -int pmap_attribute( - pmap_t pmap, - vm_offset_t address, - vm_size_t size, - vm_machine_attribute_t attribute, - vm_machine_attribute_val_t* value); /* IN/OUT */ -#endif /* JUNK */ - void pmap_bootstrap( vm_offset_t load_start, /* IN */ vm_offset_t *phys_start, /* IN/OUT */ @@ -144,7 +124,6 @@ void pmap_cache_ctrl(pmap_t pmap, vm_offset_t s, vm_offset_t e, unsigned mode); void pmap_zero_page(vm_offset_t phys); void pmap_remove_all(vm_offset_t phys); vm_offset_t pmap_extract_unlocked(pmap_t pmap, vm_offset_t va); -pmap_t pmap_kernel(void); void copy_to_phys(vm_offset_t srcva, vm_offset_t dstpa, int bytecount); void copy_from_phys(vm_offset_t srcpa, vm_offset_t dstva, int bytecount); void pmap_redzone(pmap_t pmap, vm_offset_t va); @@ -185,5 +164,6 @@ void pmap_print_trace (pmap_t pmap, vm_offset_t va, boolean_t long_format); boolean_t v); /* is valid ? */ #endif #endif /* 0 */ +#endif /* _KERNEL */ #endif /* endif _MACHINE_PMAP_H_ */ |