X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Firq%2Fhandle.c;h=a4c8f4d6f9e63db87699369ad2fc6fb8892f6942;hb=5cd4d056da050eb96d88540ecfd51245a4e1cdf7;hp=553a098888c8991ae9ed2751406712954ab9047e;hpb=b1644648ae5a87454d06f1dd96783b0ec4d292df;p=linux-2.6.git

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 553a09888..a4c8f4d6f 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -15,6 +15,7 @@
 #include <linux/random.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
+#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 
 #include "internals.h"
@@ -171,7 +172,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 +181,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 +251,6 @@ out:
 	 * disabled while the handler was running.
 	 */
 	desc->chip->end(irq);
-	__leave_vx_admin(&vxis);
 	spin_unlock(&desc->lock);
 
 	return 1;