aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-02-20 16:57:48 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 20:10:13 -0500
commitb446b60e4eb5e5457120c4728ada871b1209c1d0 (patch)
tree1fcff840a5cfb61399b9eac843d5b74e9e6b45e0 /fs
parentf4fa27c16ba9b6910c5b815e5c13a7e8249277f0 (diff)
[PATCH] rework reserved major handling
Several people have reported failures in dynamic major device number handling due to the recent changes in there to avoid handing out the local/experimental majors. Rolf reports that this is due to a gcc-4.1.0 bug. The patch refactors that code a lot in an attempt to provoke the compiler into behaving. Cc: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/char_dev.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c
index e6194e2b9bb9..78ced721554d 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -6,6 +6,7 @@
6 6
7#include <linux/init.h> 7#include <linux/init.h>
8#include <linux/fs.h> 8#include <linux/fs.h>
9#include <linux/kdev_t.h>
9#include <linux/slab.h> 10#include <linux/slab.h>
10#include <linux/string.h> 11#include <linux/string.h>
11 12
@@ -108,12 +109,7 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
108 /* temporary */ 109 /* temporary */
109 if (major == 0) { 110 if (major == 0) {
110 for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) { 111 for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
111 /* 112 if (is_lanana_major(i))
112 * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
113 * majors
114 */
115 if ((60 <= i && i <= 63) || (120 <= i && i <= 127) ||
116 (240 <= i && i <= 254))
117 continue; 113 continue;
118 if (chrdevs[i] == NULL) 114 if (chrdevs[i] == NULL)
119 break; 115 break;