For most architectures there still is an entry for the removed RAIDframe
device lurking in chrtoblktbl. While there I truncated the tables to the
minimum required size; chrtoblk() and blktochr() are designed to handle
a table shorter than cdevsw.
Ok?
natano
Index: arch/alpha/alpha/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/alpha/alpha/conf.c,v
retrieving revision 1.79
diff -u -p -r1.79 conf.c
--- arch/alpha/alpha/conf.c 23 Oct 2015 15:10:52 -0000 1.79
+++ arch/alpha/alpha/conf.c 25 Feb 2016 22:33:57 -0000
@@ -285,19 +285,5 @@ int chrtoblktbl[] = {
/* 35 */ NODEV,
/* 36 */ 0,
/* 37 */ 4, /* fd */
- /* 38 */ NODEV,
- /* 39 */ NODEV,
- /* 40 */ NODEV,
- /* 41 */ NODEV,
- /* 42 */ NODEV,
- /* 43 */ 16, /* raid */
- /* 44 */ NODEV,
- /* 45 */ NODEV,
- /* 46 */ NODEV,
- /* 47 */ NODEV,
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/amd64/amd64/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/conf.c,v
retrieving revision 1.56
diff -u -p -r1.56 conf.c
--- arch/amd64/amd64/conf.c 5 Feb 2016 06:29:01 -0000 1.56
+++ arch/amd64/amd64/conf.c 25 Feb 2016 22:33:57 -0000
@@ -388,13 +388,6 @@ int chrtoblktbl[] = {
/* 45 */ NODEV,
/* 46 */ NODEV,
/* 47 */ 17, /* rd */
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
- /* 52 */ NODEV,
- /* 53 */ NODEV,
- /* 54 */ 19, /* raid */
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/arm/arm/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/conf.c,v
retrieving revision 1.42
diff -u -p -r1.42 conf.c
--- arch/arm/arm/conf.c 23 Oct 2015 15:10:52 -0000 1.42
+++ arch/arm/arm/conf.c 25 Feb 2016 22:33:57 -0000
@@ -450,51 +450,6 @@ int chrtoblktbl[] = {
/* 24 */ 24, /* sd */
/* 25 */ 25, /* st */
/* 26 */ 26, /* cd */
- /* 27 */ NODEV,
- /* 28 */ NODEV,
- /* 29 */ NODEV,
- /* 30 */ NODEV,
- /* 31 */ NODEV,
- /* 32 */ NODEV,
- /* 33 */ NODEV,
- /* 34 */ NODEV,
- /* 35 */ NODEV,
- /* 36 */ NODEV,
- /* 37 */ NODEV,
- /* 38 */ NODEV,
- /* 39 */ NODEV,
- /* 40 */ NODEV,
- /* 41 */ NODEV,
- /* 42 */ NODEV,
- /* 43 */ NODEV,
- /* 44 */ NODEV,
- /* 45 */ NODEV,
- /* 46 */ NODEV,
- /* 47 */ NODEV,
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
- /* 52 */ NODEV,
- /* 53 */ NODEV,
- /* 54 */ NODEV,
- /* 55 */ NODEV,
- /* 56 */ NODEV,
- /* 57 */ NODEV,
- /* 58 */ NODEV,
- /* 59 */ NODEV,
- /* 60 */ NODEV,
- /* 61 */ NODEV,
- /* 62 */ NODEV,
- /* 63 */ NODEV,
- /* 64 */ NODEV,
- /* 65 */ NODEV,
- /* 66 */ NODEV,
- /* 67 */ NODEV,
- /* 68 */ NODEV,
- /* 69 */ NODEV,
- /* 70 */ NODEV,
- /* 71 */ 71, /* raid */
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/i386/i386/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/conf.c,v
retrieving revision 1.153
diff -u -p -r1.153 conf.c
--- arch/i386/i386/conf.c 5 Feb 2016 06:29:01 -0000 1.153
+++ arch/i386/i386/conf.c 25 Feb 2016 22:33:58 -0000
@@ -380,13 +380,6 @@ int chrtoblktbl[] = {
/* 45 */ NODEV,
/* 46 */ NODEV,
/* 47 */ 17, /* rd */
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
- /* 52 */ NODEV,
- /* 53 */ NODEV,
- /* 54 */ 19, /* raid */
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/landisk/landisk/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/landisk/landisk/conf.c,v
retrieving revision 1.32
diff -u -p -r1.32 conf.c
--- arch/landisk/landisk/conf.c 23 Oct 2015 15:10:52 -0000 1.32
+++ arch/landisk/landisk/conf.c 25 Feb 2016 22:33:59 -0000
@@ -426,51 +426,6 @@ int chrtoblktbl[] = {
/* 24 */ 24, /* sd */
/* 25 */ 25, /* st */
/* 26 */ 26, /* cd */
- /* 27 */ NODEV,
- /* 28 */ NODEV,
- /* 29 */ NODEV,
- /* 30 */ NODEV,
- /* 31 */ NODEV,
- /* 32 */ NODEV,
- /* 33 */ NODEV,
- /* 34 */ NODEV,
- /* 35 */ NODEV,
- /* 36 */ NODEV,
- /* 37 */ NODEV,
- /* 38 */ NODEV,
- /* 39 */ NODEV,
- /* 40 */ NODEV,
- /* 41 */ NODEV,
- /* 42 */ NODEV,
- /* 43 */ NODEV,
- /* 44 */ NODEV,
- /* 45 */ NODEV,
- /* 46 */ NODEV,
- /* 47 */ NODEV,
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
- /* 52 */ NODEV,
- /* 53 */ NODEV,
- /* 54 */ NODEV,
- /* 55 */ NODEV,
- /* 56 */ NODEV,
- /* 57 */ NODEV,
- /* 58 */ NODEV,
- /* 59 */ NODEV,
- /* 60 */ NODEV,
- /* 61 */ NODEV,
- /* 62 */ NODEV,
- /* 63 */ NODEV,
- /* 64 */ NODEV,
- /* 65 */ NODEV,
- /* 66 */ NODEV,
- /* 67 */ NODEV,
- /* 68 */ NODEV,
- /* 69 */ NODEV,
- /* 70 */ NODEV,
- /* 71 */ 71, /* raid */
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/macppc/macppc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/macppc/conf.c,v
retrieving revision 1.63
diff -u -p -r1.63 conf.c
--- arch/macppc/macppc/conf.c 23 Oct 2015 15:10:52 -0000 1.63
+++ arch/macppc/macppc/conf.c 25 Feb 2016 22:33:59 -0000
@@ -284,40 +284,6 @@ int chrtoblktbl[] = {
/* 18 */ NODEV,
/* 19 */ 14, /* vnd */
/* 20 */ 5, /* st */
- /* 21 */ NODEV,
- /* 22 */ NODEV,
- /* 23 */ NODEV,
- /* 24 */ NODEV,
- /* 25 */ NODEV,
- /* 26 */ NODEV,
- /* 27 */ NODEV,
- /* 28 */ NODEV,
- /* 29 */ NODEV,
- /* 30 */ NODEV,
- /* 31 */ NODEV,
- /* 32 */ NODEV,
- /* 33 */ NODEV,
- /* 34 */ NODEV,
- /* 35 */ NODEV,
- /* 36 */ NODEV,
- /* 37 */ NODEV,
- /* 38 */ NODEV,
- /* 39 */ NODEV,
- /* 40 */ NODEV,
- /* 41 */ NODEV,
- /* 42 */ NODEV,
- /* 43 */ NODEV,
- /* 44 */ NODEV,
- /* 45 */ NODEV,
- /* 46 */ NODEV,
- /* 47 */ NODEV,
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
- /* 52 */ NODEV,
- /* 53 */ NODEV,
- /* 54 */ 19, /* raid */
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/socppc/socppc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/socppc/socppc/conf.c,v
retrieving revision 1.24
diff -u -p -r1.24 conf.c
--- arch/socppc/socppc/conf.c 23 Oct 2015 15:10:52 -0000 1.24
+++ arch/socppc/socppc/conf.c 25 Feb 2016 22:33:59 -0000
@@ -262,40 +262,6 @@ int chrtoblktbl[] = {
/* 18 */ NODEV,
/* 19 */ 14, /* vnd */
/* 20 */ 5, /* st */
- /* 21 */ NODEV,
- /* 22 */ NODEV,
- /* 23 */ NODEV,
- /* 24 */ NODEV,
- /* 25 */ NODEV,
- /* 26 */ NODEV,
- /* 27 */ NODEV,
- /* 28 */ NODEV,
- /* 29 */ NODEV,
- /* 30 */ NODEV,
- /* 31 */ NODEV,
- /* 32 */ NODEV,
- /* 33 */ NODEV,
- /* 34 */ NODEV,
- /* 35 */ NODEV,
- /* 36 */ NODEV,
- /* 37 */ NODEV,
- /* 38 */ NODEV,
- /* 39 */ NODEV,
- /* 40 */ NODEV,
- /* 41 */ NODEV,
- /* 42 */ NODEV,
- /* 43 */ NODEV,
- /* 44 */ NODEV,
- /* 45 */ NODEV,
- /* 46 */ NODEV,
- /* 47 */ NODEV,
- /* 48 */ NODEV,
- /* 49 */ NODEV,
- /* 50 */ NODEV,
- /* 51 */ NODEV,
- /* 52 */ NODEV,
- /* 53 */ NODEV,
- /* 54 */ 19, /* raid */
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/sparc/sparc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc/sparc/conf.c,v
retrieving revision 1.65
diff -u -p -r1.65 conf.c
--- arch/sparc/sparc/conf.c 23 Oct 2015 15:10:53 -0000 1.65
+++ arch/sparc/sparc/conf.c 25 Feb 2016 22:34:00 -0000
@@ -421,18 +421,5 @@ int chrtoblktbl[] = {
/*108 */ NODEV,
/*109 */ NODEV,
/*110 */ 8,
- /*111 */ NODEV,
- /*112 */ NODEV,
- /*113 */ NODEV,
- /*114 */ NODEV,
- /*115 */ NODEV,
- /*116 */ NODEV,
- /*117 */ NODEV,
- /*118 */ NODEV,
- /*119 */ NODEV,
- /*120 */ NODEV,
- /*121 */ NODEV,
- /*122 */ NODEV,
- /*123 */ 25,
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/sparc64/sparc64/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/conf.c,v
retrieving revision 1.75
diff -u -p -r1.75 conf.c
--- arch/sparc64/sparc64/conf.c 23 Oct 2015 15:10:53 -0000 1.75
+++ arch/sparc64/sparc64/conf.c 25 Feb 2016 22:34:00 -0000
@@ -446,17 +446,5 @@ int chrtoblktbl[] = {
/*108 */ NODEV,
/*109 */ NODEV,
/*110 */ 8,
- /*111 */ NODEV,
- /*112 */ NODEV,
- /*113 */ NODEV,
- /*114 */ NODEV,
- /*115 */ NODEV,
- /*116 */ NODEV,
- /*117 */ NODEV,
- /*118 */ NODEV,
- /*119 */ NODEV,
- /*120 */ NODEV,
- /*121 */ 25,
- /*122 */ NODEV,
};
int nchrtoblktbl = nitems(chrtoblktbl);
Index: arch/vax/vax/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/vax/vax/conf.c,v
retrieving revision 1.71
diff -u -p -r1.71 conf.c
--- arch/vax/vax/conf.c 23 Oct 2015 15:10:53 -0000 1.71
+++ arch/vax/vax/conf.c 25 Feb 2016 22:34:00 -0000
@@ -352,9 +352,6 @@ int chrtoblktbl[] = {
NODEV, /* 69 */
NODEV, /* 70 */
24, /* 71 ry */
- NODEV, /* 72 */
- 25, /* 73 raid */
- NODEV, /* 74 */
};
int nchrtoblktbl = nitems(chrtoblktbl);
