[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-08fb550cb3f8e1efff5586b938eeedddb3ba0506@git.kernel.org>
Date: Fri, 3 Aug 2018 03:19:02 -0700
From: tip-bot for Palmer Dabbelt <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: palmer@...ive.com, arnd@...db.de, hpa@...or.com,
tglx@...utronix.de, gregkh@...uxfoundation.org,
will.deacon@....com, mingo@...nel.org, shea@...alevy.com,
linux-kernel@...r.kernel.org
Subject: [tip:irq/core] irqchip: Port the ARM IRQ drivers to
GENERIC_IRQ_MULTI_HANDLER
Commit-ID: 08fb550cb3f8e1efff5586b938eeedddb3ba0506
Gitweb: https://git.kernel.org/tip/08fb550cb3f8e1efff5586b938eeedddb3ba0506
Author: Palmer Dabbelt <palmer@...ive.com>
AuthorDate: Fri, 22 Jun 2018 10:01:22 -0700
Committer: Thomas Gleixner <tglx@...utronix.de>
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@...ive.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: linux@...linux.org.uk
Cc: catalin.marinas@....com
Cc: Will Deacon <will.deacon@....com>
Cc: jonas@...thpole.se
Cc: stefan.kristiansson@...nalahti.fi
Cc: shorne@...il.com
Cc: jason@...edaemon.net
Cc: marc.zyngier@....com
Cc: Arnd Bergmann <arnd@...db.de>
Cc: nicolas.pitre@...aro.org
Cc: vladimir.murzin@....com
Cc: keescook@...omium.org
Cc: jinb.park7@...il.com
Cc: yamada.masahiro@...ionext.com
Cc: alexandre.belloni@...tlin.com
Cc: pombredanne@...b.com
Cc: Greg KH <gregkh@...uxfoundation.org>
Cc: kstewart@...uxfoundation.org
Cc: jhogan@...nel.org
Cc: mark.rutland@....com
Cc: ard.biesheuvel@...aro.org
Cc: james.morse@....com
Cc: linux-arm-kernel@...ts.infradead.org
Cc: openrisc@...ts.librecores.org
Cc: Shea Levy <shea@...alevy.com>
Link: https://lkml.kernel.org/r/20180622170126.6308-2-palmer@sifive.com
---
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
Powered by blists - more mailing lists