From e872290c20d555655a2ab76aaae9b69d1592f483 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 9 Jun 2010 08:52:03 -0700 Subject: [PATCH] --- yaml --- r: 200252 b: refs/heads/master c: e411f2dda48c81c556c802d4430717950cf088fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/vhost/net.c | 2 +- trunk/include/linux/miscdevice.h | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5c4956d9f66..413b2582b7a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcdcddbcbbd39a3363bd48414bfe44553b6d698a +refs/heads/master: e411f2dda48c81c556c802d4430717950cf088fd diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c index 0f41c9195e9b..df5b6b971f26 100644 --- a/trunk/drivers/vhost/net.c +++ b/trunk/drivers/vhost/net.c @@ -637,7 +637,7 @@ const static struct file_operations vhost_net_fops = { }; static struct miscdevice vhost_net_misc = { - VHOST_NET_MINOR, + MISC_DYNAMIC_MINOR, "vhost-net", &vhost_net_fops, }; diff --git a/trunk/include/linux/miscdevice.h b/trunk/include/linux/miscdevice.h index b631c46cffd9..f6c9b7dcb9fd 100644 --- a/trunk/include/linux/miscdevice.h +++ b/trunk/include/linux/miscdevice.h @@ -3,6 +3,12 @@ #include #include +/* + * 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