Commit 7fd70c65 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Reviewed-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Link: https://lore.kernel.org/r/20201113141733.276505871@linutronix.de
parent e83694a7

arch/arm/include/asm/hardirq.h

+3 −8
Original line number Diff line number Diff line
@@ -2,16 +2,11 @@ 
#ifndef __ASM_HARDIRQ_H

#define __ASM_HARDIRQ_H



#include <linux/cache.h>

#include <linux/threads.h>

#include <asm/irq.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 __ARCH_IRQ_EXIT_IRQS_DISABLED	1

#define ack_bad_irq ack_bad_irq



#include <asm-generic/hardirq.h>



#endif /* __ASM_HARDIRQ_H */

arch/arm/include/asm/irq.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ void handle_IRQ(unsigned int, struct pt_regs *); 
void init_IRQ(void);



#ifdef CONFIG_SMP

#include <linux/cpumask.h>



extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,

					   bool exclude_self);

#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace