diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-11-13 15:02:16 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-11-23 10:31:06 +0100 |
| commit | e091bc90cd2d65f48e4688faead2911558d177d7 (patch) | |
| tree | fe380045961fd166ef956f1bad1fed14526b5df3 | |
| parent | sh: irqstat: Use the generic irq_cpustat_t (diff) | |
| download | wireguard-linux-e091bc90cd2d65f48e4688faead2911558d177d7.tar.xz wireguard-linux-e091bc90cd2d65f48e4688faead2911558d177d7.zip | |
irqstat: Move declaration into asm-generic/hardirq.h
Move the declaration of the irq_cpustat per cpu variable to
asm-generic/hardirq.h and remove the now empty linux/irq_cpustat.h header.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20201113141733.737377332@linutronix.de
| -rw-r--r-- | include/asm-generic/hardirq.h | 3 | ||||
| -rw-r--r-- | include/linux/irq_cpustat.h | 24 |
2 files changed, 2 insertions, 25 deletions
diff --git a/include/asm-generic/hardirq.h b/include/asm-generic/hardirq.h index f5dd99781e3c..7317e8258b48 100644 --- a/include/asm-generic/hardirq.h +++ b/include/asm-generic/hardirq.h @@ -12,7 +12,8 @@ typedef struct { #endif } ____cacheline_aligned irq_cpustat_t; -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ +DECLARE_PER_CPU_ALIGNED(irq_cpustat_t, irq_stat); + #include <linux/irq.h> #ifndef ack_bad_irq diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h deleted file mode 100644 index 78fb2de3ea4d..000000000000 --- a/include/linux/irq_cpustat.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __irq_cpustat_h -#define __irq_cpustat_h - -/* - * Contains default mappings for irq_cpustat_t, used by almost every - * architecture. Some arch (like s390) have per cpu hardware pages and - * they define their own mappings for irq_stat. - * - * Keith Owens <kaos@ocs.com.au> July 2000. - */ - - -/* - * Simple wrappers reducing source bloat. Define all irq_stat fields - * here, even ones that are arch dependent. That way we get common - * definitions instead of differing sets for each arch. - */ - -#ifndef __ARCH_IRQ_STAT -DECLARE_PER_CPU_ALIGNED(irq_cpustat_t, irq_stat); /* defined in asm/hardirq.h */ -#endif - -#endif /* __irq_cpustat_h */ |