From 629cc8411d1e6a0fdfb88ed6312e687f6eeaf033 Mon Sep 17 00:00:00 2001 From: kib Date: Tue, 18 Jan 2011 10:42:13 +0000 Subject: [PATCH] MFC r216952: Mark some devices as eternal. git-svn-id: svn://svn.freebsd.org/base/stable/8@217532 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- 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 ++- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 99c4ea626..96e1d8815 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 55f347300..d8ca92fde 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 302ca5eea..2396dbd25 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 1f3d4e895..ddf37daa5 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 bbfed445e..9f28d92b1 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -475,7 +475,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 01a3acc98..0b12e820b 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -247,7 +247,8 @@ static void log_drvinit(void *unused) { - 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 7f9b7d73d..035bae987 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1924,8 +1924,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 040080a1d..07d835815 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); -- 2.45.0