diff options
| -rw-r--r-- | sys/dev/ieee488/ibfoo.c | 2 | ||||
| -rw-r--r-- | sys/dev/led/led.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_dev.c | 3 | ||||
| -rw-r--r-- | sys/kern/subr_unit.c | 4 | ||||
| -rw-r--r-- | sys/kern/tty.c | 2 | ||||
| -rw-r--r-- | sys/sys/systm.h | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/ieee488/ibfoo.c b/sys/dev/ieee488/ibfoo.c index f860d44..537443d 100644 --- a/sys/dev/ieee488/ibfoo.c +++ b/sys/dev/ieee488/ibfoo.c @@ -810,7 +810,7 @@ gpib_ib_open(struct cdev *dev, int oflags, int devtype, struct thread *td) ib = malloc(sizeof *ib, M_IBFOO, M_WAITOK | M_ZERO); LIST_INIT(&ib->handles); callout_init(&ib->callout, 1); - ib->unrhdr = new_unrhdr(0, INT_MAX); + ib->unrhdr = new_unrhdr(0, INT_MAX, NULL); dev->si_drv2 = ib; ib->u = u; u->ibfoo = ib; diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c index 49e787b..11c8d3a 100644 --- a/sys/dev/led/led.c +++ b/sys/dev/led/led.c @@ -292,7 +292,7 @@ static void led_drvinit(void *unused) { - led_unit = new_unrhdr(0, minor2unit(MAXMINOR)); + led_unit = new_unrhdr(0, minor2unit(MAXMINOR), NULL); mtx_init(&led_mtx, "LED mtx", NULL, MTX_DEF); sx_init(&led_sx, "LED sx"); callout_init(&led_ch, CALLOUT_MPSAFE); diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 621631d..4e556ec 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -88,8 +88,7 @@ static void g_dev_init(struct g_class *mp) { - /* XXX: should have a #define MAX_UNIT_MINOR */ - unithdr = new_unrhdr(0, 0xffffff); + unithdr = new_unrhdr(0, minor2unit(MAXMINOR), NULL); } void diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index f021360..8c04939 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -198,7 +198,7 @@ delete_unr(struct unrhdr *uh, void *ptr) */ struct unrhdr * -new_unrhdr(u_int low, u_int high) +new_unrhdr(u_int low, u_int high, struct mtx *mutex __unused) { struct unrhdr *uh; struct unr *up; @@ -583,7 +583,7 @@ main(int argc __unused, const char **argv __unused) int i, x, m; char a[NN]; - uh = new_unrhdr(0, NN - 1); + uh = new_unrhdr(0, NN - 1, NULL); memset(a, 0, sizeof a); diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 15df71c..f916a1b 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2903,7 +2903,7 @@ ttycreate(struct tty *tp, struct cdevsw *csw, int unit, int flags, const char *f mtx_assert(&Giant, MA_OWNED); if (tty_unit == NULL) - tty_unit = new_unrhdr(0, 0xffff); + tty_unit = new_unrhdr(0, 0xffff, NULL); sunit = alloc_unr(tty_unit); tp->t_devunit = sunit; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 8c2435e..14d7f31 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -320,7 +320,7 @@ void DELAY(int usec); * Unit number allocation API. (kern/subr_unit.c) */ struct unrhdr; -struct unrhdr *new_unrhdr(u_int low, u_int high); +struct unrhdr *new_unrhdr(u_int low, u_int high, struct mtx *mutex); void delete_unrhdr(struct unrhdr *uh); u_int alloc_unr(struct unrhdr *uh); void free_unr(struct unrhdr *uh, u_int item); |
