X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Firq%2Fhandle.c;h=48a53f68af96452dd77ef113cb6b8ec1ce915276;hb=67da514125f23d27bd45d41e330ef14b6206fe69;hp=553a098888c8991ae9ed2751406712954ab9047e;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 553a09888..48a53f68a 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -15,7 +15,6 @@ #include #include #include -#include #include "internals.h" @@ -171,7 +170,6 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs) { struct irq_desc *desc = irq_desc + irq; struct irqaction *action; - struct vx_info_save vxis; unsigned int status; kstat_this_cpu.irqs[irq]++; @@ -181,17 +179,14 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs) /* * No locking required for CPU-local interrupts: */ - __enter_vx_admin(&vxis); if (desc->chip->ack) desc->chip->ack(irq); action_ret = handle_IRQ_event(irq, regs, desc->action); desc->chip->end(irq); - __leave_vx_admin(&vxis); return 1; } spin_lock(&desc->lock); - __enter_vx_admin(&vxis); if (desc->chip->ack) desc->chip->ack(irq); /* @@ -254,7 +249,6 @@ out: * disabled while the handler was running. */ desc->chip->end(irq); - __leave_vx_admin(&vxis); spin_unlock(&desc->lock); return 1;