The following commit has been merged into the irq/core branch of tip: Commit-ID: 2cb0837e56e1b04b773ed05df72297de4e010063 Gitweb: https://git.kernel.org/tip/2cb0837e56e1b04b773ed05df72297de4e010063 Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Fri, 13 Nov 2020 15:02:13 +01:00 Committer: Thomas Gleixner <t...@linutronix.de> CommitterDate: Mon, 23 Nov 2020 10:31:05 +01:00
arm64: irqstat: Get rid of duplicated declaration irq_cpustat_t is exactly the same as the asm-generic one. Define ack_bad_irq so the generic header does not emit the generic version of it. Signed-off-by: Thomas Gleixner <t...@linutronix.de> Reviewed-by: Frederic Weisbecker <frede...@kernel.org> Acked-by: Will Deacon <w...@kernel.org> Acked-by: Marc Zyngier <m...@kernel.org> Link: https://lore.kernel.org/r/20201113141733.392015...@linutronix.de --- arch/arm64/include/asm/hardirq.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/hardirq.h b/arch/arm64/include/asm/hardirq.h index 5ffa4ba..cbfa7b6 100644 --- a/arch/arm64/include/asm/hardirq.h +++ b/arch/arm64/include/asm/hardirq.h @@ -13,11 +13,8 @@ #include <asm/kvm_arm.h> #include <asm/sysreg.h> -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ +#define ack_bad_irq ack_bad_irq +#include <asm-generic/hardirq.h> #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1
