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> --- kernel/Makefile | 2 +- kernel/irq/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 35ef118..ed2c9a9 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 fff1738..639b2e1 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 -- Ben Hutchings The most exhausting thing in life is being insincere. - Anne Morrow Lindberg
Attachment:
signature.asc
Description: This is a digitally signed message part