Commit fcff5886 authored by Laura Abbott's avatar Laura Abbott Committed by Will Deacon

arm64: Treat handle_arch_irq as a function pointer

handle_arch_irq isn't actually text, it's just a function pointer.
It doesn't need to be stored in the text section and doing so
causes problesm if we ever want to make the kernel text read only.
Declare handle_arch_irq as a proper function pointer stored in
the data section.
Reviewed-by: default avatarKees Cook <>
Reviewed-by: default avatarMark Rutland <>
Acked-by: default avatarArd Biesheuvel <>
Tested-by: default avatarMark Rutland <>
Tested-by: default avatarKees Cook <>
Signed-off-by: default avatarLaura Abbott <>
Signed-off-by: default avatarWill Deacon <>
parent 3eebdbe5
......@@ -3,7 +3,6 @@
#include <asm-generic/irq.h>
extern void (*handle_arch_irq)(struct pt_regs *);
extern void migrate_irqs(void);
extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
......@@ -167,7 +167,8 @@ tsk .req x28 // current thread_info
* Interrupt handling.
.macro irq_handler
ldr x1, handle_arch_irq
adrp x1, handle_arch_irq
ldr x1, [x1, #:lo12:handle_arch_irq]
mov x0, sp
blr x1
......@@ -699,6 +700,3 @@ ENTRY(sys_rt_sigreturn_wrapper)
mov x0, sp
b sys_rt_sigreturn
.quad 0
......@@ -40,6 +40,8 @@ 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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment