misc: Fix allocation 'borrowed' by vhost_net

10, 233 is allocated officially to /dev/kmview which is shipping in
Ubuntu and Debian distributions.  vhost_net seem to have borrowed it
without making a proper request and this causes regressions in the other
distributions.

vhost_net can use a dynamic minor so use that instead.  Also update the
file with a comment to try and avoid future misunderstandings.

cc: stable@kernel.org
Signed-off-by: Alan Cox <device@lanana.org>
[ We should have caught this before 2.6.34 got released.  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index b631c46cffd9..f6c9b7dcb9fd 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -3,6 +3,12 @@
 #include <linux/module.h>
 #include <linux/major.h>
 
+/*
+ *      These allocations are managed by device@lanana.org. If you use an
+ *      entry that is not in assigned your entry may well be moved and
+ *      reassigned, or set dynamic if a fixed value is not justified.
+ */
+
 #define PSMOUSE_MINOR           1
 #define MS_BUSMOUSE_MINOR       2
 #define ATIXL_BUSMOUSE_MINOR    3
@@ -30,7 +36,6 @@
 #define HPET_MINOR              228
 #define FUSE_MINOR              229
 #define KVM_MINOR               232
-#define VHOST_NET_MINOR         233
 #define BTRFS_MINOR             234
 #define AUTOFS_MINOR            235
 #define MISC_DYNAMIC_MINOR      255