From 259eb6149d6d731420bfdf61085fb932c7cf32b0 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Wed, 11 Jan 2012 19:30:38 +0000 Subject: [PATCH] --- yaml --- r: 286171 b: refs/heads/master c: 7c7c7f01cc5e3e423120a4848a73dd5e4586f2f9 h: refs/heads/master i: 286169: 5c40b2b15ed23888424ecff0005a469f1a2838d4 286167: 647da50e48290b5ffa963fba22674c9168f88766 v: v3 --- [refs] | 2 +- trunk/Documentation/devices.txt | 3 +++ trunk/drivers/vhost/net.c | 8 +++++--- trunk/include/linux/miscdevice.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d00fe8ae978a..64491dbd35d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 252c3d84ed398b090ac2dace46fc6faa6cfaea99 +refs/heads/master: 7c7c7f01cc5e3e423120a4848a73dd5e4586f2f9 diff --git a/trunk/Documentation/devices.txt b/trunk/Documentation/devices.txt index cec8864ce4e8..00383186d8fb 100644 --- a/trunk/Documentation/devices.txt +++ b/trunk/Documentation/devices.txt @@ -447,6 +447,9 @@ Your cooperation is appreciated. 234 = /dev/btrfs-control Btrfs control device 235 = /dev/autofs Autofs control device 236 = /dev/mapper/control Device-Mapper control device + 237 = /dev/loop-control Loopback control device + 238 = /dev/vhost-net Host kernel accelerator for virtio net + 240-254 Reserved for local use 255 Reserved for MISC_DYNAMIC_MINOR diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c index 882a51fe7b3c..9dab1f51dd43 100644 --- a/trunk/drivers/vhost/net.c +++ b/trunk/drivers/vhost/net.c @@ -856,9 +856,9 @@ static const struct file_operations vhost_net_fops = { }; static struct miscdevice vhost_net_misc = { - MISC_DYNAMIC_MINOR, - "vhost-net", - &vhost_net_fops, + .minor = VHOST_NET_MINOR, + .name = "vhost-net", + .fops = &vhost_net_fops, }; static int vhost_net_init(void) @@ -879,3 +879,5 @@ MODULE_VERSION("0.0.1"); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Michael S. Tsirkin"); MODULE_DESCRIPTION("Host kernel accelerator for virtio net"); +MODULE_ALIAS_MISCDEV(VHOST_NET_MINOR); +MODULE_ALIAS("devname:vhost-net"); diff --git a/trunk/include/linux/miscdevice.h b/trunk/include/linux/miscdevice.h index 32085249e9cb..0549d2115507 100644 --- a/trunk/include/linux/miscdevice.h +++ b/trunk/include/linux/miscdevice.h @@ -42,6 +42,7 @@ #define AUTOFS_MINOR 235 #define MAPPER_CTRL_MINOR 236 #define LOOP_CTRL_MINOR 237 +#define VHOST_NET_MINOR 238 #define MISC_DYNAMIC_MINOR 255 struct device;