1 files changed, 8 insertions, 0 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 457fdac4c17d..36bd3e12a6d4 100644
--- a/block/genhd.c
+++ b/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;
                 }