summaryrefslogtreecommitdiff
path: root/kernel/irq
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@sifive.com>2018-04-03 21:31:30 -0700
committerThomas Gleixner <tglx@linutronix.de>2018-04-04 12:04:28 +0200
commitd6f73825dcd0fa1de9a6bf37c79f6109cc87b82f (patch)
tree7f5267c16df3709689d9879d7e0ca1ab7ba7698d /kernel/irq
parent71e6882b0ae7e30acf8864a5ddc897f45bcae6a0 (diff)
genirq: Make GENERIC_IRQ_MULTI_HANDLER depend on !MULTI_IRQ_HANDLER
These config switches enable the same code in the core and the not yet converted architecture code. They can be selected both by randconfig builds and cause linker error because the same symbols are defined twice. Make the new GENERIC_IRQ_MULTI_HANDLER depend on !MULTI_IRQ_HANDLER to prevent that. The dependency will be removed once all architectures are converted over. Signed-off-by: Palmer Dabbelt <palmer@sifive.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Link: https://lkml.kernel.org/r/20180404043130.31277-4-palmer@sifive.com
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index 5f3e2baefca9..c6766f326072 100644
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -134,6 +134,7 @@ config GENERIC_IRQ_DEBUGFS
endmenu
config GENERIC_IRQ_MULTI_HANDLER
+ depends on !MULTI_IRQ_HANDLER
bool
help
Allow to specify the low level IRQ handler at run time.