aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-06-09 09:39:49 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 08:50:31 -0700
commit79907d89c397b8bc2e05b347ec94e928ea919d33 (patch)
tree1f0047491ef1424272f14a032acf01f569fe84c4 /include/linux
parent84f7586edab93052bbe7eb72e1e9bce5f7b6ae45 (diff)
downloadkernel_samsung_smdk4412-79907d89c397b8bc2e05b347ec94e928ea919d33.zip
kernel_samsung_smdk4412-79907d89c397b8bc2e05b347ec94e928ea919d33.tar.gz
kernel_samsung_smdk4412-79907d89c397b8bc2e05b347ec94e928ea919d33.tar.bz2
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/miscdevice.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index b631c46..f6c9b7d 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