Messages in this thread Patch in this message | | | Date | Mon, 23 Nov 2020 22:51:44 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: irq/core] irqstat: Move declaration into asm-generic/hardirq.h |
| |
The following commit has been merged into the irq/core branch of tip:
Commit-ID: e091bc90cd2d65f48e4688faead2911558d177d7 Gitweb: https://git.kernel.org/tip/e091bc90cd2d65f48e4688faead2911558d177d7 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Fri, 13 Nov 2020 15:02:16 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Mon, 23 Nov 2020 10:31:06 +01:00
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
--- include/asm-generic/hardirq.h | 3 ++- include/linux/irq_cpustat.h | 24 ------------------------ 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 include/linux/irq_cpustat.h
diff --git a/include/asm-generic/hardirq.h b/include/asm-generic/hardirq.h index f5dd997..7317e82 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 78fb2de..0000000 --- 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 */
| |