|
|
@@ -198,8 +198,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
|
|
|
unsigned vector = ~regs->orig_ax;
|
|
|
unsigned irq;
|
|
|
|
|
|
- irq_enter();
|
|
|
- exit_idle();
|
|
|
+ entering_irq();
|
|
|
|
|
|
irq = __this_cpu_read(vector_irq[vector]);
|
|
|
|
|
|
@@ -215,7 +214,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- irq_exit();
|
|
|
+ exiting_irq();
|
|
|
|
|
|
set_irq_regs(old_regs);
|
|
|
return 1;
|
|
|
@@ -250,16 +249,9 @@ __visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
|
|
|
{
|
|
|
struct pt_regs *old_regs = set_irq_regs(regs);
|
|
|
|
|
|
- ack_APIC_irq();
|
|
|
-
|
|
|
- irq_enter();
|
|
|
-
|
|
|
- exit_idle();
|
|
|
-
|
|
|
+ entering_ack_irq();
|
|
|
inc_irq_stat(kvm_posted_intr_ipis);
|
|
|
-
|
|
|
- irq_exit();
|
|
|
-
|
|
|
+ exiting_irq();
|
|
|
set_irq_regs(old_regs);
|
|
|
}
|
|
|
#endif
|