diff options
| author | julian <julian@FreeBSD.org> | 1995-10-02 10:15:40 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 1995-10-02 10:15:40 +0000 |
| commit | 6c352a2d2db4d8a4d0e58ffe690e28f6dc802f08 (patch) | |
| tree | ceb4af4d53ea8bea0cd2052b410f8926284e2e9b /sys/kern | |
| parent | a630be8f81cb5f97d86afff5f2ccc74df87367de (diff) | |
| download | FreeBSD-src-6c352a2d2db4d8a4d0e58ffe690e28f6dc802f08.zip FreeBSD-src-6c352a2d2db4d8a4d0e58ffe690e28f6dc802f08.tar.gz | |
actually compiles.. (previous commit was to just get it into the tree)
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_conf.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 997d7bf..a306085 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -30,23 +30,26 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.15 1995/09/08 11:08:34 bde Exp $ + * $Id: kern_conf.c,v 1.1 1995/10/02 09:24:44 julian Exp $ */ #include <sys/param.h> +#include <sys/types.h> +#include <sys/systm.h> #include <sys/conf.h> extern d_open_t lkmenodev; /* * (re)place an entry in the bdevsw or cdevsw table - * return the slot used in MAJOR(*descrip) + * return the slot used in major(*descrip) */ #define ADDENTRY(TTYPE,NXXXDEV) \ int TTYPE##_add(dev_t *descrip, \ struct TTYPE *cdeventry, \ - cdevsw_t *oldentry) \ + struct TTYPE *oldentry) \ { \ - if ( (int)*decsrip == -1) { /* auto (0 is valid) */ \ + int i ; \ + if ( (int)*descrip == -1) { /* auto (0 is valid) */ \ /* \ * Search the table looking for a slot... \ */ \ @@ -58,6 +61,7 @@ int TTYPE##_add(dev_t *descrip, \ return ENFILE; \ } \ } else { /* assign */ \ + i = major(descrip); \ if (i < 0 || i >= NXXXDEV) { \ return EINVAL; \ } \ @@ -72,7 +76,7 @@ int TTYPE##_add(dev_t *descrip, \ \ /* done! */ \ *descrip = makedev(i,0); \ - return 0 \ + return 0; \ } \ ADDENTRY(cdevsw, nblkdev) |
