diff options
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/procfs/procfs_map.c | 10 | ||||
| -rw-r--r-- | sys/fs/specfs/spec_vnops.c | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index 4dae10a..c6b8966 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -36,7 +36,7 @@ * * @(#)procfs_status.c 8.3 (Berkeley) 2/17/94 * - * $Id: procfs_map.c,v 1.17 1998/04/29 04:28:22 dyson Exp $ + * $Id: procfs_map.c,v 1.18 1998/12/04 22:54:51 archie Exp $ */ #include <sys/param.h> @@ -93,7 +93,7 @@ procfs_domap(curp, p, pfs, uio) ((uio->uio_resid > 0) && (entry != &map->header)); entry = entry->next) { vm_object_t obj, tobj, lobj; - int ref_count, shadow_count, id, flags; + int ref_count, shadow_count, flags; vm_offset_t addr; int resident, privateresident; char *type; @@ -139,13 +139,11 @@ case OBJT_DEVICE: flags = obj->flags; ref_count = obj->ref_count; shadow_count = obj->shadow_count; - id = obj->id; } else { type = "none"; flags = 0; ref_count = 0; shadow_count = 0; - id = 0; } @@ -154,9 +152,9 @@ case OBJT_DEVICE: * start, end, resident, private resident, cow, access, type. */ snprintf(mebuffer, sizeof(mebuffer), - "0x%x 0x%x %d %d %d %s%s%s %d %d 0x%x %s %s %s\n", + "0x%x 0x%x %d %d %p %s%s%s %d %d 0x%x %s %s %s\n", entry->start, entry->end, - resident, privateresident, id, + resident, privateresident, obj, (entry->protection & VM_PROT_READ)?"r":"-", (entry->protection & VM_PROT_WRITE)?"w":"-", (entry->protection & VM_PROT_EXECUTE)?"x":"-", diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index ff0f347..6096a1b 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.77 1998/12/07 21:58:33 archie Exp $ + * $Id: spec_vnops.c,v 1.78 1998/12/16 00:10:51 eivind Exp $ */ #include <sys/param.h> @@ -781,7 +781,7 @@ spec_getpages(ap) blksiz = DEV_BSIZE; size = (ap->a_count + blksiz - 1) & ~(blksiz - 1); - bp = getpbuf(); + bp = getpbuf(NULL); kva = (vm_offset_t)bp->b_data; /* @@ -894,13 +894,13 @@ spec_getpages(ap) /* * Free the buffer header back to the swap buffer pool. */ - relpbuf(bp); + relpbuf(bp, NULL); return VM_PAGER_ERROR; } /* * Free the buffer header back to the swap buffer pool. */ - relpbuf(bp); + relpbuf(bp, NULL); return VM_PAGER_OK; } |
