[kernel] Fix depmod error message from hci_vhci module (rhbz 1051748)

[Josh Boyer]

commit 2432f55159f6523fca05ab466de7d3481a011b8d
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Mar 6 09:28:44 2014 -0500

    Fix depmod error message from hci_vhci module (rhbz 1051748)

 Bluetooth-allocate-static-minor-for-vhci.patch |   49 ++++++++++++++++++++++++
 kernel.spec                                    |    7 +++
 2 files changed, 56 insertions(+), 0 deletions(-)
---
diff --git a/Bluetooth-allocate-static-minor-for-vhci.patch b/Bluetooth-allocate-static-minor-for-vhci.patch
new file mode 100644
index 0000000..07c83c4
--- /dev/null
+++ b/Bluetooth-allocate-static-minor-for-vhci.patch
@@ -0,0 +1,49 @@
+Bugzilla: 1051748
+Upstream-status: Queued for 3.15
+
+From b075dd40c95d11c2c8690f6c4d6232fc0d9e7f56 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi at intel.com>
+Date: Tue, 18 Feb 2014 05:19:26 +0000
+Subject: Bluetooth: allocate static minor for vhci
+
+Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
+driver) added the module alias to hci_vhci module so it's possible to
+create the /dev/vhci node. However creating an alias without
+specifying the minor doesn't allow us to create the node ahead,
+triggerring module auto-load when it's first accessed.
+
+Starting with depmod from kmod 16 we started to warn if there's a
+devname alias without specifying the major and minor.
+
+Let's do the same done for uhid, kvm, fuse and others, specifying a
+fixed minor. In systems with systemd as the init the following will
+happen: on early boot systemd will call "kmod static-nodes" to read
+/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
+first accessed these "dead" nodes will trigger the module loading.
+
+Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
+Acked-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
+---
+(limited to 'drivers/bluetooth/hci_vhci.c')
+
+diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
+index 1ef6990..add1c6a 100644
+--- a/drivers/bluetooth/hci_vhci.c
++++ b/drivers/bluetooth/hci_vhci.c
+@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = {
+ static struct miscdevice vhci_miscdev= {
+ 	.name	= "vhci",
+ 	.fops	= &vhci_fops,
+-	.minor	= MISC_DYNAMIC_MINOR,
++	.minor	= VHCI_MINOR,
+ };
+ 
+ static int __init vhci_init(void)
+@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
+ MODULE_VERSION(VERSION);
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("devname:vhci");
++MODULE_ALIAS_MISCDEV(VHCI_MINOR);
+--
+cgit v0.9.2
diff --git a/kernel.spec b/kernel.spec
index e77090e..b662cf5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -634,6 +634,9 @@ Patch25026: keyring-fix.patch
 #rhbz 1071998
 Patch25034: bug-1071998.patch
 
+#rhbz 1051748
+Patch25035: Bluetooth-allocate-static-minor-for-vhci.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1287,6 +1290,9 @@ ApplyPatch keyring-fix.patch
 #rhbz 1071998
 ApplyPatch bug-1071998.patch
 
+#rhbz 1051748
+ApplyPatch Bluetooth-allocate-static-minor-for-vhci.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2067,6 +2073,7 @@ fi
 #                                    ||     ||
 %changelog
 * Thu Mar 06 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Fix depmod error message from hci_vhci module (rhbz 1051748)
 - Fix bogus WARN in iwlwifi (rhbz 1071998)
 
 * Wed Mar 05 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.14.0-0.rc5.git2.1