From a6922e1e8c1ff68412b1e16fd32603720f4c8e71 Mon Sep 17 00:00:00 2001 From: kib Date: Tue, 4 Jan 2011 10:59:38 +0000 Subject: Finish r210923, 210926. Mark some devices as eternal. MFC after: 2 weeks --- sys/dev/pty/pty.c | 3 ++- sys/dev/random/randomdev.c | 4 ++-- sys/geom/geom_ctl.c | 2 +- sys/kern/kern_descrip.c | 9 ++++++--- sys/kern/subr_bus.c | 4 ++-- sys/kern/subr_devstat.c | 2 +- sys/kern/subr_log.c | 3 ++- sys/kern/tty.c | 4 ++-- sys/kern/tty_tty.c | 3 ++- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/sys/dev/pty/pty.c b/sys/dev/pty/pty.c index c24396a..5a542cb 100644 --- a/sys/dev/pty/pty.c +++ b/sys/dev/pty/pty.c @@ -142,7 +142,8 @@ pty_modevent(module_t mod, int type, void *data) switch(type) { case MOD_LOAD: EVENTHANDLER_REGISTER(dev_clone, pty_clone, 0, 1000); - make_dev(&ptmx_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "ptmx"); + make_dev_credf(MAKEDEV_ETERNAL_KLD, &ptmx_cdevsw, 0, NULL, + UID_ROOT, GID_WHEEL, 0666, "ptmx"); break; case MOD_SHUTDOWN: break; diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 99c4ea6..96e1d88 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -195,8 +195,8 @@ random_modevent(module_t mod __unused, int type, void *data __unused) printf("random: \n", random_systat.ident); - random_dev = make_dev(&random_cdevsw, RANDOM_MINOR, - UID_ROOT, GID_WHEEL, 0666, "random"); + random_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &random_cdevsw, + RANDOM_MINOR, NULL, UID_ROOT, GID_WHEEL, 0666, "random"); make_dev_alias(random_dev, "urandom"); /* XXX Deprecated */ break; diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index 55f3473..d8ca92f 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -75,7 +75,7 @@ void g_ctl_init(void) { - make_dev(&g_ctl_cdevsw, 0, + make_dev_credf(MAKEDEV_ETERNAL, &g_ctl_cdevsw, 0, NULL, UID_ROOT, GID_OPERATOR, 0640, PATH_GEOM_CTL); KASSERT(GCTL_PARAM_RD == VM_PROT_READ, ("GCTL_PARAM_RD != VM_PROT_READ")); diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 302ca5e..2396dbd 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3430,11 +3430,14 @@ fildesc_drvinit(void *unused) { struct cdev *dev; - dev = make_dev(&fildesc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "fd/0"); + dev = make_dev_credf(MAKEDEV_ETERNAL, &fildesc_cdevsw, 0, NULL, + UID_ROOT, GID_WHEEL, 0666, "fd/0"); make_dev_alias(dev, "stdin"); - dev = make_dev(&fildesc_cdevsw, 1, UID_ROOT, GID_WHEEL, 0666, "fd/1"); + dev = make_dev_credf(MAKEDEV_ETERNAL, &fildesc_cdevsw, 1, NULL, + UID_ROOT, GID_WHEEL, 0666, "fd/1"); make_dev_alias(dev, "stdout"); - dev = make_dev(&fildesc_cdevsw, 2, UID_ROOT, GID_WHEEL, 0666, "fd/2"); + dev = make_dev_credf(MAKEDEV_ETERNAL, &fildesc_cdevsw, 2, NULL, + UID_ROOT, GID_WHEEL, 0666, "fd/2"); make_dev_alias(dev, "stderr"); } diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 1a8b8fc..1c82f83 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -405,8 +405,8 @@ static struct cdev *devctl_dev; static void devinit(void) { - devctl_dev = make_dev(&dev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "devctl"); + devctl_dev = make_dev_credf(MAKEDEV_ETERNAL, &dev_cdevsw, 0, NULL, + UID_ROOT, GID_WHEEL, 0600, "devctl"); mtx_init(&devsoftc.mtx, "dev mtx", "devd", MTX_DEF); cv_init(&devsoftc.cv, "dev cv"); TAILQ_INIT(&devsoftc.devq); diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index 442b2df..24963d5 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -476,7 +476,7 @@ devstat_alloc(void) mtx_assert(&devstat_mutex, MA_NOTOWNED); if (!once) { - make_dev(&devstat_cdevsw, 0, + make_dev_credf(MAKEDEV_ETERNAL, &devstat_cdevsw, 0, NULL, UID_ROOT, GID_WHEEL, 0400, DEVSTAT_DEVICE_NAME); once = 1; } diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 972f9f9..dfd0f94 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -256,7 +256,8 @@ log_drvinit(void *unused) cv_init(&log_wakeup, "klog"); callout_init_mtx(&logsoftc.sc_callout, &msgbuf_lock, 0); - make_dev(&log_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "klog"); + make_dev_credf(MAKEDEV_ETERNAL, &log_cdevsw, 0, NULL, UID_ROOT, + GID_WHEEL, 0600, "klog"); } SYSINIT(logdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,log_drvinit,NULL); diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 05eb27d..8aa3af2 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1946,8 +1946,8 @@ static void ttyconsdev_init(void *unused) { - dev_console = make_dev(&ttyconsdev_cdevsw, 0, UID_ROOT, GID_WHEEL, - 0600, "console"); + dev_console = make_dev_credf(MAKEDEV_ETERNAL, &ttyconsdev_cdevsw, 0, + NULL, UID_ROOT, GID_WHEEL, 0600, "console"); } SYSINIT(tty, SI_SUB_DRIVERS, SI_ORDER_FIRST, ttyconsdev_init, NULL); diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index 040080a..07d8358 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -87,7 +87,8 @@ ctty_drvinit(void *unused) { EVENTHANDLER_REGISTER(dev_clone, ctty_clone, 0, 1000); - ctty = make_dev(&ctty_cdevsw, 0, 0, 0, 0666, "ctty"); + ctty = make_dev_credf(MAKEDEV_ETERNAL, &ctty_cdevsw, 0, NULL, UID_ROOT, + GID_WHEEL, 0666, "ctty"); } SYSINIT(cttydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ctty_drvinit,NULL); -- cgit v1.1