The following commit has been merged into the irq/core branch of tip: Commit-ID: fd15c1941f0ae0b46d48431d0020edfc843abd33 Gitweb: https://git.kernel.org/tip/fd15c1941f0ae0b46d48431d0020edfc843abd33 Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Fri, 13 Nov 2020 15:02:15 +01:00 Committer: Thomas Gleixner <t...@linutronix.de> CommitterDate: Mon, 23 Nov 2020 10:31:06 +01:00
sh: irqstat: Use the generic irq_cpustat_t SH can now use the generic irq_cpustat_t. 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> Link: https://lore.kernel.org/r/20201113141733.625146...@linutronix.de --- arch/sh/include/asm/hardirq.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/sh/include/asm/hardirq.h b/arch/sh/include/asm/hardirq.h index edaea35..9fe4495 100644 --- a/arch/sh/include/asm/hardirq.h +++ b/arch/sh/include/asm/hardirq.h @@ -2,16 +2,10 @@ #ifndef __ASM_SH_HARDIRQ_H #define __ASM_SH_HARDIRQ_H -#include <linux/threads.h> -#include <linux/irq.h> - -typedef struct { - unsigned int __softirq_pending; - unsigned int __nmi_count; /* arch dependent */ -} ____cacheline_aligned irq_cpustat_t; - -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ - extern void ack_bad_irq(unsigned int irq); +#define ack_bad_irq ack_bad_irq +#define ARCH_WANTS_NMI_IRQSTAT + +#include <asm-generic/hardirq.h> #endif /* __ASM_SH_HARDIRQ_H */
