From 9c47cc787dcb7411bece3f1704ea6e1186dd54a7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 12 Feb 2007 00:51:44 -0800
Subject: [PATCH] --- yaml --- r: 47888 b: refs/heads/master c:
 fdf892be32d84a1745fa0aee5fc60517421b8038 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/block/genhd.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 597ff198d334..dc7256a09c27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 215122e1110f97a3f478829049b9840cf8fdde57
+refs/heads/master: fdf892be32d84a1745fa0aee5fc60517421b8038
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index 457fdac4c17d..36bd3e12a6d4 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -61,6 +61,14 @@ int register_blkdev(unsigned int major, const char *name)
 	/* temporary */
 	if (major == 0) {
 		for (index = ARRAY_SIZE(major_names)-1; index > 0; index--) {
+			/*
+			 * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
+			 * majors
+			 */
+			if ((60 <= index && index <= 63) ||
+					(120 <= index && index <= 127) ||
+					(240 <= index && index <= 254))
+				continue;
 			if (major_names[index] == NULL)
 				break;
 		}