Messages in this thread Patch in this message |  | | Date | Thu, 28 Oct 2021 20:15:23 -0000 | From | "irqchip-bot for Marc Zyngier" <> | Subject | [irqchip: irq/irqchip-next] h8300: Fix linux/irqchip.h include mess |
| |
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 837d7a8fe852cf93fff1cd3b73d707b3a6ae340f Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/837d7a8fe852cf93fff1cd3b73d707b3a6ae340f Author: Marc Zyngier <maz@kernel.org> AuthorDate: Thu, 28 Oct 2021 19:24:25 +01:00 Committer: Marc Zyngier <maz@kernel.org> CommitterDate: Thu, 28 Oct 2021 21:02:48 +01:00
h8300: Fix linux/irqchip.h include mess
h8300 drags linux/irqchip.h from asm/irq.h, which is in general a bad idea (asm/*.h should avoid dragging linux/*.h, as it is usually supposed to work the other way around).
Move the inclusion of linux/irqchip.h to the single location where it actually matters in the arch code.
Reported-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20211028172849.GA701812@roeck-us.net --- arch/h8300/include/asm/irq.h | 2 -- arch/h8300/kernel/irq.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/h8300/include/asm/irq.h b/arch/h8300/include/asm/irq.h index 5fc5b43..776cf06 100644 --- a/arch/h8300/include/asm/irq.h +++ b/arch/h8300/include/asm/irq.h @@ -2,8 +2,6 @@ #ifndef _H8300_IRQ_H_ #define _H8300_IRQ_H_ -#include <linux/irqchip.h> - #if defined(CONFIG_CPU_H8300H) #define NR_IRQS 64 #define IRQ_CHIP h8300h_irq_chip diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c index 834e4d7..8ad6d70 100644 --- a/arch/h8300/kernel/irq.c +++ b/arch/h8300/kernel/irq.c @@ -8,6 +8,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <linux/irqchip.h> #include <linux/irqdomain.h> #include <linux/of_irq.h> #include <asm/traps.h>
|  |