d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings in last commit (dev_t is not an int, and not even int

Browse Source 
compatable in arg lists on the Alpha)
This commit is contained in:
peter 1999-07-03 17:40:31 +00:00
parent 6bf98e7293
commit 05cb15a7d4
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/amd64/amd64/autoconf.c
View File

@ -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 @@ setrootbyname(char *name)
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;
}

9
sys/i386/i386/autoconf.c
View File

@ -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 @@ setrootbyname(char *name)
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;
}

6
sys/kern/vfs_conf.c
View File

@ -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;
}

6
sys/kern/vfs_mount.c
View File

@ -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;
}