From 8f0024a54a1915944e7f40bbfc91e20f6d4d6f6d Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sun, 9 May 1999 08:18:12 +0000
Subject: [PATCH] Peter beat me to half this patch, but didn't do the other
 half:

	set d_bmaj

	don't cast a dev_t to int before comparing to NODEV
---
 sys/kern/kern_conf.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index d5614e84e34..13952c3cbc1 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.33 1999/05/08 06:39:35 phk Exp $
+ * $Id: kern_conf.c,v 1.34 1999/05/09 08:10:17 peter Exp $
  */
 
 #include <sys/param.h>
@@ -72,7 +72,7 @@ cdevsw_add(dev_t *descrip,
 {
 	int i ;
 
-	if ( (int)*descrip == NODEV) {	/* auto (0 is valid) */
+	if ( *descrip == NODEV) {	/* auto (0 is valid) */
 		/*
 		 * Search the table looking for a slot...
 		 */
@@ -107,12 +107,13 @@ cdevsw_add(dev_t *descrip,
 } 
 
 void
-cdevsw_add_generic(int bmaj, int cmaj, struct cdevsw *cdevsw)
+cdevsw_add_generic(int bmaj, int cmaj, struct cdevsw *devsw)
 {
 	dev_t dev;
 
 	dev = makedev(cmaj, 0);
-	cdevsw_add(&dev, cdevsw, NULL);
+	cdevsw_add(&dev, devsw, NULL);
+	cdevsw[cmaj]->d_bmaj = bmaj;
 	bmaj2cmaj[bmaj] = cmaj;
 }