diff options
| author | Hector Martin <marcan@marcan.st> | 2021-04-08 13:21:57 +0300 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2021-04-08 13:21:57 +0300 |
| commit | 847bea3d08af9158ae9e17b43632d6aa4f1702a0 (patch) | |
| tree | 53d73622d8bcf9ea56c8bde5cc09c4fe06269338 /include/linux | |
| parent | fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d (diff) | |
| parent | 3889ba70102ed8c609e42c1d3563c8c041ce0511 (diff) | |
| download | linux-847bea3d08af9158ae9e17b43632d6aa4f1702a0.tar.xz | |
Merge remote-tracking branch 'arm64/for-next/fiq'
The FIQ support series, already merged into arm64, is a dependency
of the M1 bring-up series and was split off after the first few
versions.
Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 2efde6a79b7e..9890180b84fd 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -1258,11 +1258,13 @@ int __init set_handle_irq(void (*handle_irq)(struct pt_regs *)); */ extern void (*handle_arch_irq)(struct pt_regs *) __ro_after_init; #else +#ifndef set_handle_irq #define set_handle_irq(handle_irq) \ do { \ (void)handle_irq; \ WARN_ON(1); \ } while (0) #endif +#endif #endif /* _LINUX_IRQ_H */ |