Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f3e6af authored by Jes Sorensen's avatar Jes Sorensen Committed by Tony Luck
Browse files

[IA64] Fix kstat_this_cpu build breakage 



arch/ia64/kernel/irq_ia64.c: In function 'ia64_handle_irq':
arch/ia64/kernel/irq_ia64.c:498: error: 'struct kernel_stat' has no member named 'irqs'
arch/ia64/kernel/irq_ia64.c:500: error: 'struct kernel_stat' has no member named 'irqs'
arch/ia64/kernel/irq_ia64.c: In function 'ia64_process_pending_intr':
arch/ia64/kernel/irq_ia64.c:556: error: 'struct kernel_stat' has no member named 'irqs'
arch/ia64/kernel/irq_ia64.c:558: error: 'struct kernel_stat' has no member named 'irqs'

Fix build breakage due to recent kstat_this_cpu changes in:
   d7e51e66
   sparseirq: make some func to be used with genirq

Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent be0ea696

arch/ia64/kernel/irq_ia64.c

+15 −10
Original line number Diff line number Diff line
@@ -493,14 +493,16 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) 
	saved_tpr = ia64_getreg(_IA64_REG_CR_TPR);

	ia64_srlz_d();

	while (vector != IA64_SPURIOUS_INT_VECTOR) {

		struct irq_desc *desc;

		int irq = local_vector_to_irq(vector);



		desc = irq_desc + irq;

		if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {

			smp_local_flush_tlb();

			kstat_this_cpu.irqs[vector]++;

			kstat_incr_irqs_this_cpu(irq, desc);

		} else if (unlikely(IS_RESCHEDULE(vector)))

			kstat_this_cpu.irqs[vector]++;

			kstat_incr_irqs_this_cpu(irq, desc);

		else {

			int irq = local_vector_to_irq(vector);



			ia64_setreg(_IA64_REG_CR_TPR, vector);

			ia64_srlz_d();
@@ -551,14 +553,17 @@ void ia64_process_pending_intr(void) 
	  * Perform normal interrupt style processing

	  */

	while (vector != IA64_SPURIOUS_INT_VECTOR) {

		struct irq_desc *desc;

		int irq = local_vector_to_irq(vector);

		desc = irq_desc + irq;



		if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {

			smp_local_flush_tlb();

			kstat_this_cpu.irqs[vector]++;

			kstat_incr_irqs_this_cpu(irq, desc);

		} else if (unlikely(IS_RESCHEDULE(vector)))

			kstat_this_cpu.irqs[vector]++;

			kstat_incr_irqs_this_cpu(irq, desc);

		else {

			struct pt_regs *old_regs = set_irq_regs(NULL);

			int irq = local_vector_to_irq(vector);



			ia64_setreg(_IA64_REG_CR_TPR, vector);

			ia64_srlz_d();