[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-78ae2e1cd845480caaa2f181fee64e51f679f5aa@git.kernel.org>
Date: Fri, 3 Aug 2018 03:20:08 -0700
From: tip-bot for Palmer Dabbelt <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hch@....de, linux-kernel@...r.kernel.org, palmer@...ive.com,
will.deacon@....com, arnd@...db.de, tglx@...utronix.de,
hpa@...or.com, gregkh@...uxfoundation.org, mingo@...nel.org
Subject: [tip:irq/core] arm64: Use the new GENERIC_IRQ_MULTI_HANDLER
Commit-ID: 78ae2e1cd845480caaa2f181fee64e51f679f5aa
Gitweb: https://git.kernel.org/tip/78ae2e1cd845480caaa2f181fee64e51f679f5aa
Author: Palmer Dabbelt <palmer@...ive.com>
AuthorDate: Fri, 22 Jun 2018 10:01:24 -0700
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 3 Aug 2018 12:14:09 +0200
arm64: Use the new GENERIC_IRQ_MULTI_HANDLER
It appears arm64 copied arm's GENERIC_IRQ_MULTI_HANDLER code, but made
it unconditional.
Converts the arm64 code to use the new generic code, which simply consists
of deleting the arm64 code and setting MULTI_IRQ_HANDLER instead.
Signed-off-by: Palmer Dabbelt <palmer@...ive.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Christoph Hellwig <hch@....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
Link: https://lkml.kernel.org/r/20180622170126.6308-4-palmer@sifive.com
---
arch/arm64/Kconfig | 4 +---
arch/arm64/include/asm/irq.h | 2 --
arch/arm64/kernel/irq.c | 10 ----------
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 42c090cf0292..3d1011957823 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -74,6 +74,7 @@ config ARM64
select GENERIC_CPU_AUTOPROBE
select GENERIC_EARLY_IOREMAP
select GENERIC_IDLE_POLL_SETUP
+ select GENERIC_IRQ_MULTI_HANDLER
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select GENERIC_IRQ_SHOW_LEVEL
@@ -264,9 +265,6 @@ config ARCH_SUPPORTS_UPROBES
config ARCH_PROC_KCORE_TEXT
def_bool y
-config MULTI_IRQ_HANDLER
- def_bool y
-
source "init/Kconfig"
source "kernel/Kconfig.freezer"
diff --git a/arch/arm64/include/asm/irq.h b/arch/arm64/include/asm/irq.h
index a0fee6985e6a..b2b0c6405eb0 100644
--- a/arch/arm64/include/asm/irq.h
+++ b/arch/arm64/include/asm/irq.h
@@ -8,8 +8,6 @@
struct pt_regs;
-extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
-
static inline int nr_legacy_irqs(void)
{
return 0;
diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c
index 60e5fc661f74..780a12f59a8f 100644
--- a/arch/arm64/kernel/irq.c
+++ b/arch/arm64/kernel/irq.c
@@ -42,16 +42,6 @@ int arch_show_interrupts(struct seq_file *p, int prec)
return 0;
}
-void (*handle_arch_irq)(struct pt_regs *) = NULL;
-
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
-{
- if (handle_arch_irq)
- return;
-
- handle_arch_irq = handle_irq;
-}
-
#ifdef CONFIG_VMAP_STACK
static void init_irq_stacks(void)
{
Powered by blists - more mailing lists