diff options
author | bde <bde@FreeBSD.org> | 1995-12-17 07:19:58 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-12-17 07:19:58 +0000 |
commit | ca36bb34d136c993c606bf306e9d5921a321d9e0 (patch) | |
tree | f22710dcf39125c89b2f3f19fdde4db4e4ff4c80 | |
parent | 66fd8c873b33902688043ed3594063ac3151bc08 (diff) | |
download | FreeBSD-src-ca36bb34d136c993c606bf306e9d5921a321d9e0.zip FreeBSD-src-ca36bb34d136c993c606bf306e9d5921a321d9e0.tar.gz |
Fixed 1TB filesize changes. Some pindexes had bogus names and types
but worked because vm_pindex_t is indistinuishable from vm_offset_t.
-rw-r--r-- | sys/amd64/amd64/pmap.c | 7 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_mem.c | 10 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 7 | ||||
-rw-r--r-- | sys/miscfs/procfs/procfs_mem.c | 10 | ||||
-rw-r--r-- | sys/vm/pmap.h | 4 | ||||
-rw-r--r-- | sys/vm/swap_pager.c | 6 | ||||
-rw-r--r-- | sys/vm/vm_mmap.c | 6 | ||||
-rw-r--r-- | sys/vm/vm_page.c | 4 |
8 files changed, 23 insertions, 31 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 186a82a..49aea80 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.69 1995/12/11 04:54:58 dyson Exp $ + * $Id: pmap.c,v 1.70 1995/12/14 23:59:04 bde Exp $ */ /* @@ -170,9 +170,6 @@ static void pmap_changebit __P((vm_offset_t pa, int bit, boolean_t setem)); static void pmap_enter_quick __P((pmap_t pmap, vm_offset_t va, vm_offset_t pa)); static int pmap_is_managed __P((vm_offset_t pa)); -extern void pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr, - vm_object_t object, vm_offset_t offset, - vm_offset_t size)); static void pmap_remove_all __P((vm_offset_t pa)); static void pmap_remove_entry __P((struct pmap *pmap, pv_entry_t pv, vm_offset_t va)); @@ -375,7 +372,7 @@ pmap_bootstrap(firstaddr, loadaddr) /* * The kernel's pmap is statically allocated so we don't have to use * pmap_create, which is unlikely to work correctly at this part of - * the boot sequence. + * the boot sequence (XXX and which no longer exists). */ kernel_pmap = &kernel_pmap_store; diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index d07acf0..7dbbb7d 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_mem.c,v 1.12 1995/12/07 12:47:15 davidg Exp $ + * $Id: procfs_mem.c,v 1.13 1995/12/11 04:56:31 dyson Exp $ */ /* @@ -90,7 +90,7 @@ procfs_rwmem(p, uio) vm_prot_t out_prot; vm_page_t m; boolean_t wired, single_use; - vm_offset_t off; + vm_pindex_t pindex; u_int len; int fix_prot; @@ -150,7 +150,7 @@ procfs_rwmem(p, uio) tmap = map; error = vm_map_lookup(&tmap, pageno, writing ? VM_PROT_WRITE : VM_PROT_READ, - &out_entry, &object, &off, &out_prot, + &out_entry, &object, &pindex, &out_prot, &wired, &single_use); /* * We're done with tmap now. @@ -162,7 +162,7 @@ procfs_rwmem(p, uio) * Fault the page in... */ if (!error && writing && object->backing_object) { - m = vm_page_lookup(object, off); + m = vm_page_lookup(object, pindex); if (m == 0) error = vm_fault(map, pageno, VM_PROT_WRITE, FALSE); @@ -171,7 +171,7 @@ procfs_rwmem(p, uio) /* Find space in kernel_map for the page we're interested in */ if (!error) error = vm_map_find(kernel_map, object, - IDX_TO_OFF(off), &kva, PAGE_SIZE, 1); + IDX_TO_OFF(pindex), &kva, PAGE_SIZE, 1); if (!error) { /* diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 186a82a..49aea80 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.69 1995/12/11 04:54:58 dyson Exp $ + * $Id: pmap.c,v 1.70 1995/12/14 23:59:04 bde Exp $ */ /* @@ -170,9 +170,6 @@ static void pmap_changebit __P((vm_offset_t pa, int bit, boolean_t setem)); static void pmap_enter_quick __P((pmap_t pmap, vm_offset_t va, vm_offset_t pa)); static int pmap_is_managed __P((vm_offset_t pa)); -extern void pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr, - vm_object_t object, vm_offset_t offset, - vm_offset_t size)); static void pmap_remove_all __P((vm_offset_t pa)); static void pmap_remove_entry __P((struct pmap *pmap, pv_entry_t pv, vm_offset_t va)); @@ -375,7 +372,7 @@ pmap_bootstrap(firstaddr, loadaddr) /* * The kernel's pmap is statically allocated so we don't have to use * pmap_create, which is unlikely to work correctly at this part of - * the boot sequence. + * the boot sequence (XXX and which no longer exists). */ kernel_pmap = &kernel_pmap_store; diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index d07acf0..7dbbb7d 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/sys/miscfs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94 * - * $Id: procfs_mem.c,v 1.12 1995/12/07 12:47:15 davidg Exp $ + * $Id: procfs_mem.c,v 1.13 1995/12/11 04:56:31 dyson Exp $ */ /* @@ -90,7 +90,7 @@ procfs_rwmem(p, uio) vm_prot_t out_prot; vm_page_t m; boolean_t wired, single_use; - vm_offset_t off; + vm_pindex_t pindex; u_int len; int fix_prot; @@ -150,7 +150,7 @@ procfs_rwmem(p, uio) tmap = map; error = vm_map_lookup(&tmap, pageno, writing ? VM_PROT_WRITE : VM_PROT_READ, - &out_entry, &object, &off, &out_prot, + &out_entry, &object, &pindex, &out_prot, &wired, &single_use); /* * We're done with tmap now. @@ -162,7 +162,7 @@ procfs_rwmem(p, uio) * Fault the page in... */ if (!error && writing && object->backing_object) { - m = vm_page_lookup(object, off); + m = vm_page_lookup(object, pindex); if (m == 0) error = vm_fault(map, pageno, VM_PROT_WRITE, FALSE); @@ -171,7 +171,7 @@ procfs_rwmem(p, uio) /* Find space in kernel_map for the page we're interested in */ if (!error) error = vm_map_find(kernel_map, object, - IDX_TO_OFF(off), &kva, PAGE_SIZE, 1); + IDX_TO_OFF(pindex), &kva, PAGE_SIZE, 1); if (!error) { /* diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index b55519f..675c22b 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: pmap.h,v 1.5 1994/11/14 08:19:07 bde Exp $ + * $Id: pmap.h,v 1.6 1995/01/09 16:05:32 davidg Exp $ */ /* @@ -110,6 +110,8 @@ boolean_t pmap_is_referenced __P((vm_offset_t pa)); void pmap_kenter __P((vm_offset_t, vm_offset_t)); void pmap_kremove __P((vm_offset_t)); vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int)); +void pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr, vm_object_t object, + vm_pindex_t pindex, vm_offset_t size)); void pmap_page_protect __P((vm_offset_t, vm_prot_t)); void pmap_pageable __P((pmap_t, vm_offset_t, vm_offset_t, boolean_t)); vm_offset_t pmap_phys_address __P((int)); diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 5bc992a..1fc7f85 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.56 1995/12/14 08:32:45 phk Exp $ + * $Id: swap_pager.c,v 1.57 1995/12/14 09:54:52 phk Exp $ */ /* @@ -156,9 +156,9 @@ static int dmmin; int dmmax; static __pure int - swap_pager_block_index __P((vm_offset_t offset)) __pure2; + swap_pager_block_index __P((vm_pindex_t pindex)) __pure2; static __pure int - swap_pager_block_offset __P((vm_offset_t offset)) __pure2; + swap_pager_block_offset __P((vm_pindex_t pindex)) __pure2; static daddr_t *swap_pager_diskaddr __P((vm_object_t object, vm_pindex_t pindex, int *valid)); static void swap_pager_finish __P((swp_clean_t spc)); diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 5ef3afa..6579961 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id: vm_mmap.c,v 1.32 1995/12/11 04:58:17 dyson Exp $ + * $Id: vm_mmap.c,v 1.33 1995/12/13 12:28:39 dyson Exp $ */ /* @@ -71,10 +71,6 @@ #include <vm/vm_pageout.h> #include <vm/vm_extern.h> -extern void pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr, - vm_object_t object, vm_offset_t offset, - vm_offset_t size)); - #ifndef _SYS_SYSPROTO_H_ struct sbrk_args { int incr; diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 4823730..facc875 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.42 1995/12/11 15:41:50 dyson Exp $ + * $Id: vm_page.c,v 1.43 1995/12/14 09:55:07 phk Exp $ */ /* @@ -122,7 +122,7 @@ static u_short vm_page_dev_bsize_chunks[] = { }; static inline __pure int - vm_page_hash __P((vm_object_t object, vm_offset_t offset)) + vm_page_hash __P((vm_object_t object, vm_pindex_t pindex)) __pure2; static void vm_page_unqueue __P((vm_page_t )); |