diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata-disk.c | 4 | ||||
| -rw-r--r-- | sys/dev/ccd/ccd.c | 4 | ||||
| -rw-r--r-- | sys/dev/vn/vn.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 2de8c7b2f13a..86b4ff4eb4cb 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ata-disk.c,v 1.8 1999/05/07 07:03:11 phk Exp $ + * $Id: ata-disk.c,v 1.9 1999/05/07 16:37:06 peter Exp $ */ #include "ata.h" @@ -78,7 +78,7 @@ static struct cdevsw ad_cdevsw = { }; /* misc defines */ -#define UNIT(dev) (dev>>3 & 0x1f) /* assume 8 minor # per unit */ +#define UNIT(dev) (minor(dev)>>3 & 0x1f) /* assume 8 minor # per unit */ #define NUNIT 16 /* max # of devices */ /* prototypes */ diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index c904d6cc6b55..1ff7fd72922e 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -1,4 +1,4 @@ -/* $Id: ccd.c,v 1.45 1999/05/07 07:03:17 phk Exp $ */ +/* $Id: ccd.c,v 1.46 1999/05/07 10:09:42 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -361,7 +361,7 @@ ccdinit(ccd, cpaths, p) free(cs->sc_cinfo, M_DEVBUF); return (error); } - ci->ci_dev = va.va_rdev; + ci->ci_dev = udev2dev(va.va_rdev, 2); /* * Get partition information for the component. diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index a26100c80f3b..f3db33627f92 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id: vn.c,v 1.77 1999/05/07 07:03:20 phk Exp $ + * $Id: vn.c,v 1.78 1999/05/07 10:10:10 phk Exp $ */ /* @@ -80,6 +80,7 @@ #include <sys/mount.h> #include <sys/vnode.h> #include <sys/fcntl.h> +#include <sys/conf.h> #include <sys/disklabel.h> #include <sys/diskslice.h> #include <sys/stat.h> |