Commit abe17ab7 authored by Martin Pitt's avatar Martin Pitt
Browse files

Replace "Always probe cpu support drivers" patch with cherry-picked upstream fix

That patch is more general and will go away when we move to newer upstream
versions.
parent b01d9f08
systemd (204-11) UNRELEASED; urgency=medium
* Explain patch management in debian/README.source.
* Replace "Always probe cpu support drivers" patch with cherry-picked
upstream fix which is more general.
-- Martin Pitt <mpitt@debian.org> Sun, 27 Apr 2014 12:51:55 +0200
......
From: Andy Whitcroft <apw@canonical.com>
Date: Sat, 26 Apr 2014 23:12:58 +0200
Subject: Always probe cpu support drivers
The kernel from v3.11 now reports (correctly) that there is a
CPU driver connected to the CPUs in the kernel. This causes udev
to ignore the device and prevents any CPU helper modules such as KVM or
AES optimisations from being loaded. These should be loaded regardless
of whether there is a CPU driver.
Reported-by: Chris J Arges <chris.j.arges@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1207705
Forwarded: no
---
rules/80-drivers.rules | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
index 01760ef..c65ea15 100644
--- a/rules/80-drivers.rules
+++ b/rules/80-drivers.rules
@@ -3,6 +3,7 @@
ACTION=="remove", GOTO="drivers_end"
DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
+SUBSYSTEM=="cpu", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}="kmod load tifm_sd"
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}="kmod load tifm_ms"
SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block"
From: Kay Sievers <kay@vrfy.org>
Date: Sat, 20 Jul 2013 14:29:12 +0200
Subject: rules: drivers - always call kmod,
even when a driver is bound to the device
On Sat, Jul 20, 2013 at 12:56 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> After a recent change present in 3.11-rc1 there is a driver, called processor,
> that can be bound to the CPU devices whose sysfs directories are located under
> /sys/devices/system/cpu/. A side effect of this is that, after the driver has
> been bound to those devices, the kernel adds DRIVER=processor to ENV for CPU
> uevents and they don't match the default rule for autoloading modules matching
> MODALIAS:
>
> DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}"
>
> any more. However, there are some modules whose module aliases match specific
> CPU features through the modalias string and those modules should be loaded
> automatically if a compatible CPU is present. Yet, with the processor driver
> bound to the CPU devices the above rule is not sufficient for that, so we need
> a new default udev rule allowing those modules to be autoloaded even if the
> CPU devices have drivers.
---
rules/80-drivers.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
index 01760ef..127da7e 100644
--- a/rules/80-drivers.rules
+++ b/rules/80-drivers.rules
@@ -2,7 +2,7 @@
ACTION=="remove", GOTO="drivers_end"
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
+ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}"
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}="kmod load tifm_sd"
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}="kmod load tifm_ms"
SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block"
......@@ -53,4 +53,4 @@ logind-if-a-user-is-sitting-in-front-of-the-computer.patch
insserv.conf-generator.patch
Add-targets-for-compatibility-with-Debian-insserv-sy.patch
more-cd-aliases.patch
Always-probe-cpu-support-drivers.patch
rules-drivers-always-call-kmod-even-when-a-driver-is.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment