Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (8d735b41) · Commits · e / devices / android_kernel_sony_msm8994

arch/ia64/kernel/irq_ia64.c

+15 −10

Original line number	Original line	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);		saved_tpr = ia64_getreg(_IA64_REG_CR_TPR);
	ia64_srlz_d();		ia64_srlz_d();
	while (vector != IA64_SPURIOUS_INT_VECTOR) {		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))) {		if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {
	smp_local_flush_tlb();		smp_local_flush_tlb();
	kstat_this_cpu.irqs[vector]++;		kstat_incr_irqs_this_cpu(irq, desc);
	} else if (unlikely(IS_RESCHEDULE(vector)))		} else if (unlikely(IS_RESCHEDULE(vector)))
	kstat_this_cpu.irqs[vector]++;		kstat_incr_irqs_this_cpu(irq, desc);
	else {		else {
	int irq = local_vector_to_irq(vector);

	ia64_setreg(_IA64_REG_CR_TPR, vector);		ia64_setreg(_IA64_REG_CR_TPR, vector);
	ia64_srlz_d();		ia64_srlz_d();

	@@ -551,14 +553,17 @@ void ia64_process_pending_intr(void)
	* Perform normal interrupt style processing		* Perform normal interrupt style processing
	*/		*/
	while (vector != IA64_SPURIOUS_INT_VECTOR) {		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))) {		if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {
	smp_local_flush_tlb();		smp_local_flush_tlb();
	kstat_this_cpu.irqs[vector]++;		kstat_incr_irqs_this_cpu(irq, desc);
	} else if (unlikely(IS_RESCHEDULE(vector)))		} else if (unlikely(IS_RESCHEDULE(vector)))
	kstat_this_cpu.irqs[vector]++;		kstat_incr_irqs_this_cpu(irq, desc);
	else {		else {
	struct pt_regs *old_regs = set_irq_regs(NULL);		struct pt_regs *old_regs = set_irq_regs(NULL);
	int irq = local_vector_to_irq(vector);

	ia64_setreg(_IA64_REG_CR_TPR, vector);		ia64_setreg(_IA64_REG_CR_TPR, vector);
	ia64_srlz_d();		ia64_srlz_d();