X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fsparc%2Fkernel%2Firq.c;fp=arch%2Fsparc%2Fkernel%2Firq.c;h=72f0201051a0bd9fa0cff67c8a3792e5dbf3795c;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=1c7e6e3eed0189b02f3d7eebd663680deadbb2cd;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 1c7e6e3ee..72f020105 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -29,7 +29,6 @@
 #include <linux/threads.h>
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
-#include <linux/vs_context.h>
 
 #include <asm/ptrace.h>
 #include <asm/processor.h>
@@ -322,7 +321,6 @@ void handler_irq(int irq, struct pt_regs * regs)
 {
 	struct irqaction * action;
 	int cpu = smp_processor_id();
-	struct vx_info_save vxis;
 #ifdef CONFIG_SMP
 	extern void smp4m_irq_rotate(int cpu);
 #endif
@@ -337,14 +335,12 @@ void handler_irq(int irq, struct pt_regs * regs)
 	action = sparc_irq[irq].action;
 	sparc_irq[irq].flags |= SPARC_IRQ_INPROGRESS;
 	kstat_cpu(cpu).irqs[irq]++;
-	__enter_vx_admin(&vxis);
 	do {
 		if (!action || !action->handler)
 			unexpected_irq(irq, NULL, regs);
 		action->handler(irq, action->dev_id, regs);
 		action = action->next;
 	} while (action);
-	__leave_vx_admin(&vxis);
 	sparc_irq[irq].flags &= ~SPARC_IRQ_INPROGRESS;
 	enable_pil_irq(irq);
 	irq_exit();
@@ -356,14 +352,11 @@ extern void floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
 	int cpu = smp_processor_id();
-	struct vx_info_save vxis;
 
 	disable_pil_irq(irq);
 	irq_enter();
 	kstat_cpu(cpu).irqs[irq]++;
-	__enter_vx_admin(&vxis);
 	floppy_interrupt(irq, dev_id, regs);
-	__leave_vx_admin(&vxis);
 	irq_exit();
 	enable_pil_irq(irq);
 	// XXX Eek, it's totally changed with preempt_count() and such