x86: move kstat_irqs from kstat to irq_desc - fix
fix broken with kstat when rebasing sparse_irq
Signed-off-by Yinghai Lu <[email protected]>
--- include/linux/irq.h | 4 ++-- include/linux/kernel_stat.h | 10 ++++++++-- kernel/irq/chip.c | 21 ++++++++++++++++++++- kernel/irq/handle.c | 10 ++++++++++ 4 files changed, 40 insertions(+), 5 deletions(-)
include/linux/irq.h +2 -2
@@ -161,8 +161,6 @@ struct irq_desc {#endif #ifdef CONFIG_HAVE_DYN_ARRAY unsigned int *kstat_irqs; -#else -unsigned int kstat_irqs[NR_CPUS ];#endif #if defined(CONFIG_INTR_REMAP ) && defined(CONFIG_HAVE_SPARSE_IRQ )struct irq_2_iommu *irq_2_iommu;
@@ -219,8 +217,10 @@ extern struct irq_desc *sparse_irqs;#endif +#ifdef CONFIG_HAVE_DYN_ARRAY #define kstat_irqs_this_cpu (DESC ) \ ((DESC)->kstat_irqs[smp_processor_id()]) +#endif /* * Migration helpers for obsolete names, they will go away:
include/linux/kernel_stat.h +8 -2
@@ -28,7 +28,7 @@ struct cpu_usage_stat {struct kernel_stat {struct cpu_usage_stat cpustat; -#ifndef CONFIG_GENERIC_HARDIRQS +#ifndef CONFIG_HAVE_DYN_ARRAY unsigned int irqs[NR_IRQS ];#endif };
@@ -41,7 +41,13 @@ DECLARE_PER_CPU(struct kernel_stat, kstaextern unsigned long long nr_context_switches (void ); -#ifndef CONFIG_GENERIC_HARDIRQS +#ifndef CONFIG_HAVE_DYN_ARRAY +#define kstat_irqs_this_cpu (irq) \ + (kstat_this_cpu.irqs[irq]) +#endif + + +#ifndef CONFIG_HAVE_DYN_ARRAY static inline unsigned int kstat_irqs_cpu (unsigned int irq,int cpu) {return kstat_cpu (cpu).irqs[irq];
kernel/irq/chip.c +20 -1
@@ -326,7 +326,11 @@ handle_simple_irq(unsigned int irq, struif (unlikely (desc->status &IRQ_INPROGRESS )) goto out_unlock; desc->status &= ~(IRQ_REPLAY |IRQ_WAITING ); +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif action = desc->action;if (unlikely (!action || (desc->status &IRQ_DISABLED )))
@@ -367,7 +371,11 @@ handle_level_irq(unsigned int irq, strucif (unlikely (desc->status &IRQ_INPROGRESS )) goto out_unlock; desc->status &= ~(IRQ_REPLAY |IRQ_WAITING ); +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif /* * If its disabled or no action available
@@ -414,7 +422,11 @@ handle_fasteoi_irq(unsigned int irq, str goto out; desc->status &= ~(IRQ_REPLAY |IRQ_WAITING ); +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif /* * If its disabled or no action available
@@ -478,8 +490,11 @@ handle_edge_irq(unsigned int irq, structmask_ack_irq (desc, irq); goto out_unlock; } - +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif /* Start handling the irq */ desc->chip->ack (irq);
@@ -534,7 +549,11 @@ handle_percpu_irq(unsigned int irq, stru {irqreturn_t action_ret; +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif if (desc->chip->ack) desc->chip->ack (irq);
kernel/irq/handle.c +10 -0
@@ -34,7 +34,11 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc) {print_irq_desc (irq, desc); +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif ack_bad_irq (irq); }
@@ -401,7 +405,11 @@ unsigned int __do_IRQ(unsigned int irq)struct irqaction *action;unsigned int status; +#ifdef CONFIG_HAVE_DYN_ARRAY kstat_irqs_this_cpu (desc)++; +#else +kstat_irqs_this_cpu (irq)++; +#endif if (CHECK_IRQ_PER_CPU (desc->status)) {irqreturn_t action_ret;
@@ -501,10 +509,12 @@ void early_init_irq_lock_class(void) }#endif +#ifdef CONFIG_HAVE_DYN_ARRAY unsigned int kstat_irqs_cpu (unsigned int irq,int cpu) {struct irq_desc *desc =irq_to_desc (irq);return desc->kstat_irqs[cpu]; } +#endif EXPORT_SYMBOL (kstat_irqs_cpu);
Ingo Molnar
AppliedQuoted 3 lines · Yinghai Lu
fix broken with kstat when rebasing
sparse_irqSigned-off-by Yinghai Lu <[email protected]>
applied to tip/irq/sparseirq, thanks Yinghai.
will this fix the powerpc build breakage reported by Stephen?
Ingo
Quoted 11 lines · Ingo Molnar
Quoted 3 lines · Yinghai Lu
fix broken with kstat when rebasing
sparse_irqSigned-off-by Yinghai Lu <[email protected]>applied to tip/irq/sparseirq, thanks Yinghai.
will this fix the powerpc build breakage reported by Stephen?
yes.
maybe you need to squash it into
x86: move kstat_irqs from kstat to irq_desc
YH