Date: Wed, 20 Feb 2008 17:58:47 GMT From: "Randall R. Stewart" <rrs@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135807 for review Message-ID: <200802201758.m1KHwlof075603@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135807 Change 135807 by rrs@rrs-mips2-jnpr on 2008/02/20 17:58:30 S9 indent of file. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#10 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#10 (text+ko) ==== @@ -72,33 +72,34 @@ /* * Pmap stuff */ -struct pv_entry; +struct pv_entry; struct md_page { - int pv_list_count; - int pv_flags; - TAILQ_HEAD(,pv_entry) pv_list; + int pv_list_count; + int pv_flags; + TAILQ_HEAD(, pv_entry)pv_list; }; -#define PV_TABLE_MOD 0x01 /* modified */ -#define PV_TABLE_REF 0x02 /* referenced */ +#define PV_TABLE_MOD 0x01 /* modified */ +#define PV_TABLE_REF 0x02 /* referenced */ #define ASID_BITS 8 #define ASIDGEN_BITS (32 - ASID_BITS) #define ASIDGEN_MASK ((1 << ASIDGEN_BITS) - 1) struct pmap { - pd_entry_t *pm_segtab; /* KVA of segment table */ - TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - int pm_count; /* reference count */ - int pm_active; /* active on cpus */ + pd_entry_t *pm_segtab; /* KVA of segment table */ + TAILQ_HEAD(, pv_entry)pm_pvlist; /* list of mappings in + * pmap */ + int pm_count; /* reference count */ + int pm_active; /* active on cpus */ struct { - u_int32_t asid:ASID_BITS; /* TLB address space tag */ - u_int32_t gen:ASIDGEN_BITS; /* its generation number */ - } pm_asid[MAXSMPCPU]; - struct pmap_statistics pm_stats; /* pmap statistics */ - struct vm_page *pm_ptphint; /* pmap ptp hint */ - struct mtx pm_mtx; + u_int32_t asid:ASID_BITS; /* TLB address space tag */ + u_int32_t gen:ASIDGEN_BITS; /* its generation number */ + } pm_asid[MAXSMPCPU]; + struct pmap_statistics pm_stats; /* pmap statistics */ + struct vm_page *pm_ptphint; /* pmap ptp hint */ + struct mtx pm_mtx; }; typedef struct pmap *pmap_t; @@ -108,10 +109,10 @@ #include <sys/proc.h> #include <vm/vm_map.h> -pt_entry_t *pmap_pte(pmap_t, vm_offset_t); -pd_entry_t pmap_segmap(pmap_t pmap, vm_offset_t va); -vm_offset_t pmap_kextract(vm_offset_t va); -extern pmap_t kernel_pmap; +pt_entry_t *pmap_pte(pmap_t, vm_offset_t); +pd_entry_t pmap_segmap(pmap_t pmap, vm_offset_t va); +vm_offset_t pmap_kextract(vm_offset_t va); +extern pmap_t kernel_pmap; #define vtophys(va) pmap_kextract(((vm_offset_t) (va))) @@ -131,20 +132,20 @@ #define PMAP_LGMEM_UNLOCK(sysmap) mtx_unlock(&(sysmap)->lock) #define PMAP_LGMEM_DESTROY(sysmap) mtx_destroy(&(sysmap)->lock) -#endif /* _KERNEL */ +#endif /* _KERNEL */ /* * For each vm_page_t, there is a list of all currently valid virtual * mappings of that page. An entry is a pv_entry_t, the list is pv_table. */ typedef struct pv_entry { - pmap_t pv_pmap; /* pmap where mapping lies */ - vm_offset_t pv_va; /* virtual address for mapping */ - TAILQ_ENTRY(pv_entry) pv_list; - TAILQ_ENTRY(pv_entry) pv_plist; - vm_page_t pv_ptem; /* VM page for pte */ - boolean_t pv_wired; /* whether this entry is wired */ -} *pv_entry_t; + pmap_t pv_pmap; /* pmap where mapping lies */ + vm_offset_t pv_va; /* virtual address for mapping */ + TAILQ_ENTRY(pv_entry)pv_list; + TAILQ_ENTRY(pv_entry)pv_plist; + vm_page_t pv_ptem; /* VM page for pte */ + boolean_t pv_wired; /* whether this entry is wired */ +} *pv_entry_t; #ifdef _KERNEL @@ -164,7 +165,7 @@ extern vm_offset_t clean_eva; extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; -extern char *ptvmmap; /* poor name! */ +extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; extern pd_entry_t *segbase; @@ -176,20 +177,20 @@ #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) #define pmap_kernel() kernel_pmap -void pmap_bootstrap(void); -void *pmap_mapdev(vm_offset_t, vm_size_t); -void pmap_unmapdev(vm_offset_t, vm_size_t); +void pmap_bootstrap(void); +void *pmap_mapdev(vm_offset_t, vm_size_t); +void pmap_unmapdev(vm_offset_t, vm_size_t); vm_offset_t pmap_steal_memory(vm_size_t size); -void pmap_set_modified(vm_offset_t pa); -int page_is_managed(vm_offset_t pa); -void pmap_page_is_free(vm_page_t m); -void pmap_kushmem_reattach(struct proc *); -/* PMAP_INLINE */ void pmap_kenter(vm_offset_t va, vm_paddr_t pa); -/* PMAP_INLINE */ void pmap_kremove(vm_offset_t va); -void * pmap_kenter_temporary(vm_paddr_t pa, int i); -void pmap_kenter_temporary_free(vm_paddr_t pa); -int pmap_compute_pages_to_dump(void); -void pmap_update_page(pmap_t pmap, vm_offset_t va, pt_entry_t pte); +void pmap_set_modified(vm_offset_t pa); +int page_is_managed(vm_offset_t pa); +void pmap_page_is_free(vm_page_t m); +void pmap_kushmem_reattach(struct proc *); + /* PMAP_INLINE */ void pmap_kenter(vm_offset_t va, vm_paddr_t pa); + /* PMAP_INLINE */ void pmap_kremove(vm_offset_t va); +void *pmap_kenter_temporary(vm_paddr_t pa, int i); +void pmap_kenter_temporary_free(vm_paddr_t pa); +int pmap_compute_pages_to_dump(void); +void pmap_update_page(pmap_t pmap, vm_offset_t va, pt_entry_t pte); /* * floating virtual pages (FPAGES) @@ -200,15 +201,16 @@ #define FPAGES 2 #define FPAGES_SHARED 2 #define FSPACE ((FPAGES * MAXCPU + FPAGES_SHARED) * PAGE_SIZE) -#define PMAP_FPAGE1 0x00 /* Used by pmap_zero_page & pmap_copy_page */ +#define PMAP_FPAGE1 0x00 /* Used by pmap_zero_page & + * pmap_copy_page */ #define PMAP_FPAGE2 0x01 /* Used by pmap_copy_page */ #define PMAP_FPAGE3 0x00 /* Used by pmap_zero_page_idle */ #define PMAP_FPAGE_KENTER_TEMP 0x01 /* Used by coredump */ struct fpage { - vm_offset_t kva; - u_int state; + vm_offset_t kva; + u_int state; }; struct sysmaps { @@ -216,12 +218,13 @@ struct fpage fp[FPAGES]; }; -vm_offset_t pmap_map_fpage(vm_paddr_t pa, struct fpage *fp, - boolean_t check_unmaped); -void pmap_unmap_fpage(vm_paddr_t pa, struct fpage *fp); +vm_offset_t +pmap_map_fpage(vm_paddr_t pa, struct fpage *fp, + boolean_t check_unmaped); +void pmap_unmap_fpage(vm_paddr_t pa, struct fpage *fp); -#endif /* _KERNEL */ +#endif /* _KERNEL */ -#endif /* !LOCORE */ +#endif /* !LOCORE */ -#endif /* !_MACHINE_PMAP_H_ */ +#endif /* !_MACHINE_PMAP_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802201758.m1KHwlof075603>