| Message ID | 20201113141733.392015387@linutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | softirq: Cleanups and RT awareness | expand |
On Fri, Nov 13, 2020 at 03:02:13PM +0100, Thomas Gleixner wrote: > 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> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: Marc Zyngier <maz@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > --- > arch/arm64/include/asm/hardirq.h | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) Acked-by: Will Deacon <will@kernel.org> Will
On 2020-11-13 14:02, Thomas Gleixner wrote: > 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> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: Marc Zyngier <maz@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > --- > arch/arm64/include/asm/hardirq.h | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > --- a/arch/arm64/include/asm/hardirq.h > +++ b/arch/arm64/include/asm/hardirq.h > @@ -13,11 +13,8 @@ > #include <asm/kvm_arm.h> > #include <asm/sysreg.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 ack_bad_irq ack_bad_irq > +#include <asm-generic/hardirq.h> > > #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1 Acked-by: Marc Zyngier <maz@kernel.org> M.
--- a/arch/arm64/include/asm/hardirq.h +++ b/arch/arm64/include/asm/hardirq.h @@ -13,11 +13,8 @@ #include <asm/kvm_arm.h> #include <asm/sysreg.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 ack_bad_irq ack_bad_irq +#include <asm-generic/hardirq.h> #define __ARCH_IRQ_EXIT_IRQS_DISABLED 1
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> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Marc Zyngier <maz@kernel.org> Cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/include/asm/hardirq.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)