From 76f3dc132581416fac9e543342c18262689ccf0e Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 12 Feb 2007 00:51:43 -0800
Subject: [PATCH] --- yaml --- r: 47887 b: refs/heads/master c:
 215122e1110f97a3f478829049b9840cf8fdde57 h: refs/heads/master i:   47885:
 0f1fabd9fcb30b6c7805c169da1e35330b4ce022   47883:
 691c9f346400c0e94f7b18cea18ef4f11d90ac65   47879:
 51efb961f6c3848bf0cefa8cb993baa9feb86d53   47871:
 2b28476ccc00a59a6f8dc671e9c0f845d0fe8c94 v: v3

---
 [refs]              | 2 +-
 trunk/fs/char_dev.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e54c1833f643..597ff198d334 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab8eb1cffcc5640ca5b07c2a0ddfaa8fbbcc754
+refs/heads/master: 215122e1110f97a3f478829049b9840cf8fdde57
diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c
index a885f46ca001..e6194e2b9bb9 100644
--- a/trunk/fs/char_dev.c
+++ b/trunk/fs/char_dev.c
@@ -108,6 +108,13 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
 	/* temporary */
 	if (major == 0) {
 		for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
+			/*
+			 * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
+			 * majors
+			 */
+			if ((60 <= i && i <= 63) || (120 <= i && i <= 127) ||
+					(240 <= i && i <= 254))
+				continue;
 			if (chrdevs[i] == NULL)
 				break;
 		}