diff options
| author | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
| commit | 6a5dc97620c08ad609e1b3c3c042f150feb46dd3 (patch) | |
| tree | 6cfc9338ae83f67fd38a853cd0782713c73cad13 /sys/vm/vm_swap.c | |
| parent | 881e2636833297a207a791fabd8befc818b1b3fb (diff) | |
| download | FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.zip FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.tar.gz | |
Simplify cdevsw registration.
The cdevsw_add() function now finds the major number(s) in the
struct cdevsw passed to it. cdevsw_add_generic() is no longer
needed, cdevsw_add() does the same thing.
cdevsw_add() will print an message if the d_maj field looks bogus.
Remove nblkdev and nchrdev variables. Most places they were used
bogusly. Instead check a dev_t for validity by seeing if devsw()
or bdevsw() returns NULL.
Move bdevsw() and devsw() functions to kern/kern_conf.c
Bump __FreeBSD_version to 400006
This commit removes:
72 bogus makedev() calls
26 bogus SYSINIT functions
if_xe.c bogusly accessed cdevsw[], author/maintainer please fix.
I4b and vinum not changed. Patches emailed to authors. LINT
probably broken until they catch up.
Diffstat (limited to 'sys/vm/vm_swap.c')
| -rw-r--r-- | sys/vm/vm_swap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 662f3bf..d8d7540 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.68 1999/05/12 11:05:23 phk Exp $ + * $Id: vm_swap.c,v 1.69 1999/05/30 16:53:49 phk Exp $ */ #include "opt_devfs.h" @@ -223,7 +223,7 @@ swapon(p, uap) switch (vp->v_type) { case VBLK: dev = vp->v_rdev; - if (major(dev) >= nblkdev || bdevsw(dev) == NULL) { + if (bdevsw(dev) == NULL) { error = ENXIO; break; } @@ -368,7 +368,7 @@ static void sw_drvinit(void *unused) { if( ! sw_devsw_installed ) { - cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &sw_cdevsw); + cdevsw_add(&sw_cdevsw); /* * XXX: This is pretty gross, but it will disappear with * the blockdevices RSN. |
