diff options
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 9 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 9 | ||||
| -rw-r--r-- | sys/kern/vfs_conf.c | 6 | ||||
| -rw-r--r-- | sys/kern/vfs_mount.c | 6 |
4 files changed, 16 insertions, 14 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 05507a8..66a26ac 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.125 1999/06/01 18:56:10 phk Exp $ + * $Id: autoconf.c,v 1.126 1999/07/03 08:23:50 phk Exp $ */ /* @@ -439,7 +439,8 @@ setroot() majdev = B_TYPE(bootdev); dev = makebdev(majdev, 0); if (bdevsw(dev) == NULL) { - printf("No bdevsw (majdev=%d bootdev=%08x)\n", majdev, bootdev); + printf("No bdevsw (majdev=%d bootdev=%p)\n", majdev, + (void *)bootdev); setconf(); return; } @@ -556,8 +557,8 @@ gotit: return (1); } rootdev = makebdev(bd, dkmakeminor(unit, slice, part)); - printf("driver=%s, unit=%d, slice=%d, part=%d -> rootdev=%08x\n", - name, unit, slice, part, rootdev); + printf("driver=%s, unit=%d, slice=%d, part=%d -> rootdev=%p\n", + name, unit, slice, part, (void *)rootdev); return 0; } diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 05507a8..66a26ac 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.125 1999/06/01 18:56:10 phk Exp $ + * $Id: autoconf.c,v 1.126 1999/07/03 08:23:50 phk Exp $ */ /* @@ -439,7 +439,8 @@ setroot() majdev = B_TYPE(bootdev); dev = makebdev(majdev, 0); if (bdevsw(dev) == NULL) { - printf("No bdevsw (majdev=%d bootdev=%08x)\n", majdev, bootdev); + printf("No bdevsw (majdev=%d bootdev=%p)\n", majdev, + (void *)bootdev); setconf(); return; } @@ -556,8 +557,8 @@ gotit: return (1); } rootdev = makebdev(bd, dkmakeminor(unit, slice, part)); - printf("driver=%s, unit=%d, slice=%d, part=%d -> rootdev=%08x\n", - name, unit, slice, part, rootdev); + printf("driver=%s, unit=%d, slice=%d, part=%d -> rootdev=%p\n", + name, unit, slice, part, (void *)rootdev); return 0; } diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 27d53ba..c2c53f7 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id: vfs_conf.c,v 1.29 1999/06/26 14:44:24 peter Exp $ + * $Id: vfs_conf.c,v 1.30 1999/07/03 08:24:00 phk Exp $ */ /* @@ -129,7 +129,7 @@ vfs_mountrootfs(void *unused) * New root mount structure */ if ((err = vfs_rootmountalloc(mountrootfsname, ROOTNAME, &mp))) { - printf("rootdev=%08x error=%d, ", rootdev, err); + printf("rootdev=%p error=%d, ", (void *)rootdev, err); panic("cannot mount root\n"); return ; } @@ -170,7 +170,7 @@ vfs_mountrootfs(void *unused) * (hardly worthwhile with the PANIC eh?) */ free( mp, M_MOUNT); - printf("rootdev=%08x error=%d, ", rootdev, err); + printf("rootdev=%p error=%d, ", (void *)rootdev, err); panic("cannot mount root (2)\n"); return; } diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 27d53ba..c2c53f7 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id: vfs_conf.c,v 1.29 1999/06/26 14:44:24 peter Exp $ + * $Id: vfs_conf.c,v 1.30 1999/07/03 08:24:00 phk Exp $ */ /* @@ -129,7 +129,7 @@ vfs_mountrootfs(void *unused) * New root mount structure */ if ((err = vfs_rootmountalloc(mountrootfsname, ROOTNAME, &mp))) { - printf("rootdev=%08x error=%d, ", rootdev, err); + printf("rootdev=%p error=%d, ", (void *)rootdev, err); panic("cannot mount root\n"); return ; } @@ -170,7 +170,7 @@ vfs_mountrootfs(void *unused) * (hardly worthwhile with the PANIC eh?) */ free( mp, M_MOUNT); - printf("rootdev=%08x error=%d, ", rootdev, err); + printf("rootdev=%p error=%d, ", (void *)rootdev, err); panic("cannot mount root (2)\n"); return; } |
