Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: 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 <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lore.kernel.org/r/20201113141733.276505871@linutronix.de

+5 -8
+3 -8
arch/arm/include/asm/hardirq.h
··· 2 2 #ifndef __ASM_HARDIRQ_H 3 3 #define __ASM_HARDIRQ_H 4 4 5 - #include <linux/cache.h> 6 - #include <linux/threads.h> 7 5 #include <asm/irq.h> 8 6 9 - typedef struct { 10 - unsigned int __softirq_pending; 11 - } ____cacheline_aligned irq_cpustat_t; 12 - 13 - #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ 14 - 15 7 #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1 8 + #define ack_bad_irq ack_bad_irq 9 + 10 + #include <asm-generic/hardirq.h> 16 11 17 12 #endif /* __ASM_HARDIRQ_H */
+2
arch/arm/include/asm/irq.h
··· 31 31 void init_IRQ(void); 32 32 33 33 #ifdef CONFIG_SMP 34 + #include <linux/cpumask.h> 35 + 34 36 extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask, 35 37 bool exclude_self); 36 38 #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace