diff options
author | bde <bde@FreeBSD.org> | 1998-07-11 11:30:46 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-07-11 11:30:46 +0000 |
commit | 0bd5cff68705e9108678e69202e95f349932dffd (patch) | |
tree | 12aec2f86d22897860c0cd09f186e2e413b45553 /sys/vm | |
parent | bf789b0550e94de4d37d45bf1e7b79908ab09be6 (diff) | |
download | FreeBSD-src-0bd5cff68705e9108678e69202e95f349932dffd.zip FreeBSD-src-0bd5cff68705e9108678e69202e95f349932dffd.tar.gz |
Fixed printf format errors.
Diffstat (limited to 'sys/vm')
-rw-r--r-- | sys/vm/vm_map.c | 6 | ||||
-rw-r--r-- | sys/vm/vm_object.c | 14 | ||||
-rw-r--r-- | sys/vm/vnode_pager.c | 12 |
3 files changed, 20 insertions, 12 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index f8cdc5a..72b3d5c 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.129 1998/06/21 14:53:43 bde Exp $ + * $Id: vm_map.c,v 1.130 1998/07/11 07:46:12 bde Exp $ */ /* @@ -2863,8 +2863,8 @@ DB_SHOW_COMMAND(map, vm_map_print) } #endif - db_iprintf("map entry 0x%x: start=0x%lx, end=0x%lx\n", - (long) entry, (long) entry->start, (long) entry->end); + db_iprintf("map entry %p: start=%p, end=%p\n", + (void *)entry, (void *)entry->start, (void *)entry->end); nlines++; if (map->is_main_map) { static char *inheritance_name[4] = diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index cdc60a6..5f5cd61 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.122 1998/06/07 17:13:12 dfr Exp $ + * $Id: vm_object.c,v 1.123 1998/06/21 14:53:44 bde Exp $ */ /* @@ -1567,10 +1567,12 @@ DB_SHOW_COMMAND(vmochk, vm_object_check) object->size); } if (!vm_object_in_map(object)) { - db_printf("vmochk: internal obj is not in a map: " - "ref: %d, size: %d: 0x%x, backing_object: 0x%x\n", - object->ref_count, object->size, - object->size, object->backing_object); + db_printf( + "vmochk: internal obj is not in a map: " + "ref: %d, size: %lu: 0x%lx, backing_object: %p\n", + object->ref_count, (u_long)object->size, + (u_long)object->size, + (void *)object->backing_object); } } } @@ -1659,7 +1661,7 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_pages) int rcount; vm_page_t m; - db_printf("new object: 0x%x\n", object); + db_printf("new object: %p\n", (void *)object); if ( nl > 18) { c = cngetc(); if (c != ' ') diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 3fb323c..fdda3e3 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.92 1998/07/04 20:45:42 julian Exp $ + * $Id: vnode_pager.c,v 1.93 1998/07/11 07:46:16 bde Exp $ */ /* @@ -647,8 +647,14 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage) IDX_TO_OFF(m[i]->pindex), &runpg); if (firstaddr == -1) { if (i == reqpage && foff < object->un_pager.vnp.vnp_size) { - panic("vnode_pager_getpages: unexpected missing page: firstaddr: %d, foff: %ld, vnp_size: %d", - firstaddr, foff, object->un_pager.vnp.vnp_size); + /* XXX no %qd in kernel. */ + panic("vnode_pager_getpages: unexpected missing page: firstaddr: %d, foff: 0x%lx%08lx, vnp_size: 0x%lx%08lx", + firstaddr, (u_long)(foff >> 32), + (u_long)(u_int32_t)foff, + (u_long)(u_int32_t) + (object->un_pager.vnp.vnp_size >> 32), + (u_long)(u_int32_t) + object->un_pager.vnp.vnp_size); } vnode_pager_freepage(m[i]); runend = i + 1; |