summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/irq.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2021-08-30 10:05:46 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2021-08-30 10:05:46 -0300
commitc635813fef0b2327ffecbfbd642f0009e186b3a5 (patch)
tree10ce89c8b5c36b890123024849cfd3f53e0affc5 /arch/powerpc/kernel/irq.c
parent37c3193fa4d7ddf93947264fa38d71120ff20c2a (diff)
parent7d2a07b769330c34b4deabeed939325c77a7ec2f (diff)
downloadlinux-c635813fef0b2327ffecbfbd642f0009e186b3a5.tar.gz
linux-c635813fef0b2327ffecbfbd642f0009e186b3a5.tar.bz2
linux-c635813fef0b2327ffecbfbd642f0009e186b3a5.zip
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r--arch/powerpc/kernel/irq.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 91e63eac4e8f..551b653228c4 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -750,7 +750,7 @@ void __do_irq(struct pt_regs *regs)
trace_irq_exit(regs);
}
-DEFINE_INTERRUPT_HANDLER_ASYNC(do_IRQ)
+void __do_IRQ(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);
void *cursp, *irqsp, *sirqsp;
@@ -774,6 +774,11 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(do_IRQ)
set_irq_regs(old_regs);
}
+DEFINE_INTERRUPT_HANDLER_ASYNC(do_IRQ)
+{
+ __do_IRQ(regs);
+}
+
static void *__init alloc_vm_stack(void)
{
return __vmalloc_node(THREAD_SIZE, THREAD_ALIGN, THREADINFO_GFP,