linux-kernel - [tip:irq/core] openrisc: Use the new GENERIC_IRQ_MULTI

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 3 Aug 2018 03:20:44 -0700
From:   tip-bot for Palmer Dabbelt <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     will.deacon@....com, tglx@...utronix.de,
        gregkh@...uxfoundation.org, palmer@...ive.com, mingo@...nel.org,
        shorne@...il.com, hpa@...or.com, linux-kernel@...r.kernel.org,
        arnd@...db.de
Subject: [tip:irq/core] openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER

Commit-ID:  c5ca4560de0f04a3c872bdd17ae3378762c66bd2
Gitweb:     https://git.kernel.org/tip/c5ca4560de0f04a3c872bdd17ae3378762c66bd2
Author:     Palmer Dabbelt <palmer@...ive.com>
AuthorDate: Fri, 22 Jun 2018 10:01:25 -0700
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 3 Aug 2018 12:14:09 +0200

openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER

It appears that openrisc copied arm64's GENERIC_IRQ_MULTI_HANDLER code
(which came from arm).  Cnvert it to use the generic version.

Signed-off-by: Palmer Dabbelt <palmer@...ive.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Stafford Horne <shorne@...il.com>
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: 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-5-palmer@sifive.com

---
 arch/openrisc/Kconfig           | 5 +----
 arch/openrisc/include/asm/irq.h | 2 --
 arch/openrisc/kernel/irq.c      | 7 -------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 9ecad05bfc73..dfb6a79ba7ff 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -27,7 +27,6 @@ config OPENRISC
 	select GENERIC_STRNLEN_USER
 	select GENERIC_SMP_IDLE_THREAD
 	select MODULES_USE_ELF_RELA
-	select MULTI_IRQ_HANDLER
 	select HAVE_DEBUG_STACKOVERFLOW
 	select OR1K_PIC
 	select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1
@@ -36,6 +35,7 @@ config OPENRISC
 	select ARCH_USE_QUEUED_RWLOCKS
 	select OMPIC if SMP
 	select ARCH_WANT_FRAME_POINTERS
+	select GENERIC_IRQ_MULTI_HANDLER
 
 config CPU_BIG_ENDIAN
 	def_bool y
@@ -69,9 +69,6 @@ config STACKTRACE_SUPPORT
 config LOCKDEP_SUPPORT
 	def_bool  y
 
-config MULTI_IRQ_HANDLER
-	def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/openrisc/include/asm/irq.h b/arch/openrisc/include/asm/irq.h
index d9eee0a2b7b4..eb612b1865d2 100644
--- a/arch/openrisc/include/asm/irq.h
+++ b/arch/openrisc/include/asm/irq.h
@@ -24,6 +24,4 @@
 
 #define NO_IRQ		(-1)
 
-extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
-
 #endif /* __ASM_OPENRISC_IRQ_H__ */
diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index 35e478a93116..5f9445effaf8 100644
--- a/arch/openrisc/kernel/irq.c
+++ b/arch/openrisc/kernel/irq.c
@@ -41,13 +41,6 @@ void __init init_IRQ(void)
 	irqchip_init();
 }
 
-static void (*handle_arch_irq)(struct pt_regs *);
-
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
-{
-	handle_arch_irq = handle_irq;
-}
-
 void __irq_entry do_IRQ(struct pt_regs *regs)
 {
 	handle_arch_irq(regs);