Commit-ID: 08fb550cb3f8e1efff5586b938eeedddb3ba0506 Gitweb: https://git.kernel.org/tip/08fb550cb3f8e1efff5586b938eeedddb3ba0506 Author: Palmer Dabbelt <palmer@xxxxxxxxxx> AuthorDate: Fri, 22 Jun 2018 10:01:22 -0700 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Fri, 3 Aug 2018 12:14:08 +0200 irqchip: Port the ARM IRQ drivers to GENERIC_IRQ_MULTI_HANDLER GENERIC_IRQ_MULTI_HANDLER is incompatible with MULTI_IRQ_HANDLER because they define the same symbols. Multiple generic irqchip drivers select MULTI_IRQ_HANDLER, which is now defined on all architectures that provide set_handle_irq(). To solve this select GENERIC_IRQ_MULTI_HANDLER for all drivers that used to select MULTI_IRQ_HANDLER, but only when MULTI_IRQ_HANDLER doesn't exist. After that every architecture can be converted over from MULTI_IRQ_HANDLER to GENERIC_IRQ_MULTI_HANDLER before removing the extra MULTI_IRQ_HANDLER scaffolding. Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: linux@xxxxxxxxxxxxxxx Cc: catalin.marinas@xxxxxxx Cc: Will Deacon <will.deacon@xxxxxxx> Cc: jonas@xxxxxxxxxxxx Cc: stefan.kristiansson@xxxxxxxxxxxxx Cc: shorne@xxxxxxxxx Cc: jason@xxxxxxxxxxxxxx Cc: marc.zyngier@xxxxxxx Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: nicolas.pitre@xxxxxxxxxx Cc: vladimir.murzin@xxxxxxx Cc: keescook@xxxxxxxxxxxx Cc: jinb.park7@xxxxxxxxx Cc: yamada.masahiro@xxxxxxxxxxxxx Cc: alexandre.belloni@xxxxxxxxxxx Cc: pombredanne@xxxxxxxx Cc: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: kstewart@xxxxxxxxxxxxxxxxxxx Cc: jhogan@xxxxxxxxxx Cc: mark.rutland@xxxxxxx Cc: ard.biesheuvel@xxxxxxxxxx Cc: james.morse@xxxxxxx Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: openrisc@xxxxxxxxxxxxxxxxxxxx Cc: Shea Levy <shea@xxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20180622170126.6308-2-palmer@xxxxxxxxxx --- drivers/irqchip/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index e9233db16e03..7527f6a9adae 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -9,6 +9,7 @@ config ARM_GIC select IRQ_DOMAIN select IRQ_DOMAIN_HIERARCHY select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select GENERIC_IRQ_EFFECTIVE_AFF_MASK config ARM_GIC_PM @@ -35,6 +36,7 @@ config ARM_GIC_V3 bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select IRQ_DOMAIN_HIERARCHY select PARTITION_PERCPU select GENERIC_IRQ_EFFECTIVE_AFF_MASK @@ -67,6 +69,7 @@ config ARM_VIC bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER config ARM_VIC_NR int @@ -94,6 +97,7 @@ config ATMEL_AIC_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ config ATMEL_AIC5_IRQ @@ -101,6 +105,7 @@ config ATMEL_AIC5_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ config I8259 @@ -138,6 +143,7 @@ config FARADAY_FTINTC010 bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ config HISILICON_IRQ_MBIGEN @@ -163,6 +169,7 @@ config CLPS711X_IRQCHIP depends on ARCH_CLPS711X select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ default y @@ -182,6 +189,7 @@ config ORION_IRQCHIP bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER config PIC32_EVIC bool -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|