Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ca4560 authored by Palmer Dabbelt's avatar Palmer Dabbelt Committed by Thomas Gleixner
Browse files

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: default avatarPalmer Dabbelt <palmer@sifive.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarStafford Horne <shorne@gmail.com>
Cc: linux@armlinux.org.uk
Cc: catalin.marinas@arm.com
Cc: Will Deacon <will.deacon@arm.com>
Cc: jonas@southpole.se
Cc: stefan.kristiansson@saunalahti.fi
Cc: jason@lakedaemon.net
Cc: marc.zyngier@arm.com
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: nicolas.pitre@linaro.org
Cc: vladimir.murzin@arm.com
Cc: keescook@chromium.org
Cc: jinb.park7@gmail.com
Cc: yamada.masahiro@socionext.com
Cc: alexandre.belloni@bootlin.com
Cc: pombredanne@nexb.com
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: kstewart@linuxfoundation.org
Cc: jhogan@kernel.org
Cc: mark.rutland@arm.com
Cc: ard.biesheuvel@linaro.org
Cc: james.morse@arm.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: openrisc@lists.librecores.org
Link: https://lkml.kernel.org/r/20180622170126.6308-5-palmer@sifive.com
parent 78ae2e1c

arch/openrisc/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -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"

arch/openrisc/include/asm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -24,6 +24,4 @@ 


#define NO_IRQ		(-1)



extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));



#endif /* __ASM_OPENRISC_IRQ_H__ */

arch/openrisc/kernel/irq.c

+0 −7
Original line number Diff line number Diff line
@@ -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);