diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-09-30 00:53:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 07:17:58 -0700 |
| commit | bf47a46dd51af02f27f1ee703fc0e6b1d1ca26bc (patch) | |
| tree | 068b538bb1e0319bbae53de37106548379704656 | |
| parent | 0889e3eb7e561824a554ab7c5092718c844acbe8 (diff) | |
irq: Always define devm_{request_threaded,free}_irq()
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 <ben@decadent.org.uk>
| -rw-r--r-- | kernel/Makefile | 2 | ||||
| -rw-r--r-- | kernel/irq/Makefile | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 35ef1185e359..ed2c9a97d0a0 100644 --- 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 diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile index fff17381f0af..639b2e1ac16c 100644 --- 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 |