diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_conf.c | 11 | ||||
| -rw-r--r-- | sys/kern/kern_shutdown.c | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index f14f1e6..209a970 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_conf.c,v 1.50 1999/07/19 09:37:59 phk Exp $ + * $Id: kern_conf.c,v 1.51 1999/07/20 09:47:41 phk Exp $ */ #include <sys/param.h> @@ -242,6 +242,15 @@ dev2udev(dev_t x) return (x->si_udev); } +udev_t +dev2budev(dev_t x) +{ + if (dumpdev == NODEV) + return NOUDEV; + else + return makeudev(devsw(x)->d_bmaj, minor(x)); +} + dev_t udev2dev(udev_t x, int b) { diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 91e13b3..8cc58ca 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $Id: kern_shutdown.c,v 1.55 1999/07/17 20:47:50 phk Exp $ + * $Id: kern_shutdown.c,v 1.56 1999/07/20 20:55:50 green Exp $ */ #include "opt_ddb.h" @@ -408,10 +408,7 @@ sysctl_kern_dumpdev SYSCTL_HANDLER_ARGS int error; udev_t ndumpdev; - if (dumpdev != NODEV) - ndumpdev = makeudev(devsw(dumpdev)->d_bmaj, minor(dumpdev)); - else - ndumpdev = dev2udev(dumpdev); + ndumpdev = dev2budev(dumpdev); error = sysctl_handle_opaque(oidp, &ndumpdev, sizeof ndumpdev, req); if (error == 0 && req->newptr != NULL) error = setdumpdev(udev2dev(ndumpdev, 1)); |
