core/linux-raspberrypi-latest to 3.15.7-1

This commit is contained in:
moonman 2014-07-29 23:59:43 -06:00
parent 713062f337
commit 139b118d32
3 changed files with 9 additions and 79 deletions

View file

@ -1,74 +0,0 @@
From 5d77ba2d26110c678b40fd723866a17d4036de12 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 18 Feb 2014 02:19:26 -0300
Subject: [PATCH 1/6] 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@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
Documentation/devices.txt | 1 +
drivers/bluetooth/hci_vhci.c | 3 ++-
include/linux/miscdevice.h | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 10378cc..04356f5 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -353,6 +353,7 @@ Your cooperation is appreciated.
133 = /dev/exttrp External device trap
134 = /dev/apm_bios Advanced Power Management BIOS
135 = /dev/rtc Real Time Clock
+ 137 = /dev/vhci Bluetooth virtual HCI driver
139 = /dev/openprom SPARC OpenBoot PROM
140 = /dev/relay8 Berkshire Products Octal relay card
141 = /dev/relay16 Berkshire Products ISO-16 relay card
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);
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 3737f72..7bb6148 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -23,6 +23,7 @@
#define TEMP_MINOR 131 /* Temperature Sensor */
#define RTC_MINOR 135
#define EFI_RTC_MINOR 136 /* EFI Time services */
+#define VHCI_MINOR 137
#define SUN_OPENPROM_MINOR 139
#define DMAPI_MINOR 140 /* DMAPI */
#define NVRAM_MINOR 144
--
1.9.1

View file

@ -5,11 +5,11 @@
buildarch=18 buildarch=18
pkgbase=linux-raspberrypi-latest pkgbase=linux-raspberrypi-latest
_commit=f9b062f9b1c25d2ae3ce480179ad0c4d3033bd23 _commit=30d2c6249691737507c4b054f3224fddc0595ee0
_srcname=linux-${_commit} _srcname=linux-${_commit}
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="Raspberry Pi" _desc="Raspberry Pi"
pkgver=3.15.6 pkgver=3.15.7
pkgrel=1 pkgrel=1
bfqver=v7r5 bfqver=v7r5
@ -30,8 +30,8 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch") "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch")
md5sums=('89acf8f3437509f5e79dd25e3ddac187' md5sums=('03d018e5c0ab0c87f04709b6f0ee7c57'
'8988cc304eb8ffcbfca4acf0b71617b8' '44367e19849b9ca9c2ced568564a58d3'
'c0d63f4d42fd334bf31e4f749d4694f3' 'c0d63f4d42fd334bf31e4f749d4694f3'
'9335d1263fd426215db69841a380ea26' '9335d1263fd426215db69841a380ea26'
'a00e424e2fbb8c5a5f77ba2c4871bed4' 'a00e424e2fbb8c5a5f77ba2c4871bed4'

View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 3.15.5-1 Kernel Configuration # Linux/arm 3.15.7-1 Kernel Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -289,6 +289,7 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_ASN1=m CONFIG_ASN1=m
CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_FREEZER=y CONFIG_FREEZER=y
# #
@ -1939,6 +1940,7 @@ CONFIG_I2C_ALGOBIT=y
# #
# I2C system bus drivers (mostly embedded / system-on-chip) # I2C system bus drivers (mostly embedded / system-on-chip)
# #
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2708=m
CONFIG_I2C_BCM2708_BAUDRATE=100000 CONFIG_I2C_BCM2708_BAUDRATE=100000
# CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_CBUS_GPIO is not set
@ -1975,6 +1977,7 @@ CONFIG_SPI_MASTER=y
# SPI Master Controller Drivers # SPI Master Controller Drivers
# #
# CONFIG_SPI_ALTERA is not set # CONFIG_SPI_ALTERA is not set
CONFIG_SPI_BCM2835=m
CONFIG_SPI_BCM2708=m CONFIG_SPI_BCM2708=m
CONFIG_SPI_BITBANG=m CONFIG_SPI_BITBANG=m
CONFIG_SPI_GPIO=m CONFIG_SPI_GPIO=m
@ -3768,6 +3771,7 @@ CONFIG_AUFS_SBILIST=y
CONFIG_AUFS_HNOTIFY=y CONFIG_AUFS_HNOTIFY=y
CONFIG_AUFS_HFSNOTIFY=y CONFIG_AUFS_HFSNOTIFY=y
CONFIG_AUFS_EXPORT=y CONFIG_AUFS_EXPORT=y
# CONFIG_AUFS_FHSM is not set
CONFIG_AUFS_RDU=y CONFIG_AUFS_RDU=y
CONFIG_AUFS_SHWH=y CONFIG_AUFS_SHWH=y
CONFIG_AUFS_BR_RAMFS=y CONFIG_AUFS_BR_RAMFS=y