Skip to content

Commit 7fd70c6

Browse files
committed
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
1 parent e83694a commit 7fd70c6

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

arch/arm/include/asm/hardirq.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22
#ifndef __ASM_HARDIRQ_H
33
#define __ASM_HARDIRQ_H
44

5-
#include <linux/cache.h>
6-
#include <linux/threads.h>
75
#include <asm/irq.h>
86

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-
157
#define __ARCH_IRQ_EXIT_IRQS_DISABLED 1
8+
#define ack_bad_irq ack_bad_irq
9+
10+
#include <asm-generic/hardirq.h>
1611

1712
#endif /* __ASM_HARDIRQ_H */

arch/arm/include/asm/irq.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ void handle_IRQ(unsigned int, struct pt_regs *);
3131
void init_IRQ(void);
3232

3333
#ifdef CONFIG_SMP
34+
#include <linux/cpumask.h>
35+
3436
extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,
3537
bool exclude_self);
3638
#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace

0 commit comments

Comments
 (0)