The following commit has been merged into the irq/core branch of tip: Commit-ID: e83694a7b249de63beb1d8b45474b796dce3cd45 Gitweb: https://git.kernel.org/tip/e83694a7b249de63beb1d8b45474b796dce3cd45 Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Fri, 13 Nov 2020 15:02:11 +01:00 Committer: Thomas Gleixner <t...@linutronix.de> CommitterDate: Mon, 23 Nov 2020 10:31:05 +01:00
um/irqstat: Get rid of the duplicated declarations irq_cpustat_t and ack_bad_irq() are exactly the same as the asm-generic ones. Signed-off-by: Thomas Gleixner <t...@linutronix.de> Reviewed-by: Frederic Weisbecker <frede...@kernel.org> Link: https://lore.kernel.org/r/20201113141733.156361...@linutronix.de --- arch/um/include/asm/hardirq.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/arch/um/include/asm/hardirq.h b/arch/um/include/asm/hardirq.h index b426796..52e2c36 100644 --- a/arch/um/include/asm/hardirq.h +++ b/arch/um/include/asm/hardirq.h @@ -2,22 +2,7 @@ #ifndef __ASM_UM_HARDIRQ_H #define __ASM_UM_HARDIRQ_H -#include <linux/cache.h> -#include <linux/threads.h> - -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ -#include <linux/irq.h> - -#ifndef ack_bad_irq -static inline void ack_bad_irq(unsigned int irq) -{ - printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq); -} -#endif +#include <asm-generic/hardirq.h> #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1
