From: Greg Kroah-Hartman Date: Thu, 3 Oct 2013 02:51:24 +0000 (-0700) Subject: 3.11-stable patches X-Git-Tag: v3.0.99~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=530534d4bf377459dd6629d7b56843f67ff4c3f0;p=thirdparty%2Fkernel%2Fstable-queue.git 3.11-stable patches added patches: irq-always-define-devm_-request_threaded-free-_irq.patch --- diff --git a/queue-3.11/irq-always-define-devm_-request_threaded-free-_irq.patch b/queue-3.11/irq-always-define-devm_-request_threaded-free-_irq.patch new file mode 100644 index 00000000000..2cfe5a37ed0 --- /dev/null +++ b/queue-3.11/irq-always-define-devm_-request_threaded-free-_irq.patch @@ -0,0 +1,50 @@ +From ben@decadent.org.uk Wed Oct 2 19:49:05 2013 +From: Ben Hutchings +Date: Mon, 30 Sep 2013 00:53:31 +0100 +Subject: irq: Always define devm_{request_threaded,free}_irq() +To: stable@vger.kernel.org +Cc: linux-kernel@vger.kernel.org, Debian kernel maintainers , linux-s390@vger.kernel.org, Thomas Gleixner +Message-ID: <1380498811.14493.7.camel@deadeye.wl.decadent.org.uk> + +From: Ben Hutchings + +This is only needed for 3.11, as s390 has now been changed to use the +generic IRQ code upstream. + +These functions are currently defined only if CONFIG_GENERIC_HARDIRQS +is enabled. But they are still needed on s390 which has its own IRQ +management. + +References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=s390&ver=3.11%7Erc4-1%7Eexp1&stamp=1376009959 +Signed-off-by: Ben Hutchings +--- + kernel/Makefile | 2 +- + kernel/irq/Makefile | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +--- a/kernel/Makefile ++++ b/kernel/Makefile +@@ -79,7 +79,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o + obj-$(CONFIG_KGDB) += debug/ + obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o + obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o +-obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ ++obj-y += irq/ + obj-$(CONFIG_SECCOMP) += seccomp.o + obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o + obj-$(CONFIG_TREE_RCU) += rcutree.o +--- a/kernel/irq/Makefile ++++ b/kernel/irq/Makefile +@@ -1,8 +1,10 @@ +- +-obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o ++obj-y += devres.o ++ifdef CONFIG_GENERIC_HARDIRQS ++obj-y += irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o + obj-$(CONFIG_GENERIC_IRQ_CHIP) += generic-chip.o + obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o + obj-$(CONFIG_IRQ_DOMAIN) += irqdomain.o + obj-$(CONFIG_PROC_FS) += proc.o + obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o + obj-$(CONFIG_PM_SLEEP) += pm.o ++endif diff --git a/queue-3.11/series b/queue-3.11/series index 115fbf89737..26d862d09a0 100644 --- a/queue-3.11/series +++ b/queue-3.11/series @@ -54,3 +54,4 @@ drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch drm-radeon-fix-hdmi-audio-on-dce3.0-3.1-asics.patch hwmon-applesmc-check-key-count-before-proceeding.patch alsa-compress-fix-compress-device-unregister.patch +irq-always-define-devm_-request_threaded-free-_irq.patch