Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[IA64] use generic_handle_irq()

Use generic_handle_irq() to handle mixed-type irq handling.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>

authored by

Ingo Molnar and committed by
Tony Luck
5fbb004a 06344db3

+3 -3
+1 -1
arch/ia64/kernel/irq.c
··· 197 197 struct pt_regs *old_regs = set_irq_regs(NULL); 198 198 199 199 vectors_in_migration[irq]=0; 200 - __do_IRQ(irq); 200 + generic_handle_irq(irq); 201 201 set_irq_regs(old_regs); 202 202 } 203 203 }
+2 -2
arch/ia64/kernel/irq_ia64.c
··· 186 186 ia64_setreg(_IA64_REG_CR_TPR, vector); 187 187 ia64_srlz_d(); 188 188 189 - __do_IRQ(local_vector_to_irq(vector)); 189 + generic_handle_irq(local_vector_to_irq(vector)); 190 190 191 191 /* 192 192 * Disable interrupts and send EOI: ··· 242 242 * Probably could shared code. 243 243 */ 244 244 vectors_in_migration[local_vector_to_irq(vector)]=0; 245 - __do_IRQ(local_vector_to_irq(vector)); 245 + generic_handle_irq(local_vector_to_irq(vector)); 246 246 set_irq_regs(old_regs); 247 247 248 248 /*