Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / arch / frv / kernel / irq.c

diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 1c2a72c..0896701 100644 (file)
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -32,7 +32,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/module.h>
-#include <linux/vs_context.h>
 
 #include <asm/atomic.h>
 #include <asm/io.h>
@@ -283,7 +282,6 @@ EXPORT_SYMBOL(enable_irq);
 asmlinkage void do_IRQ(void)
 {
        struct irq_source *source;
-       struct vx_info_save vxis;
        int level, cpu;
 
        irq_enter();
@@ -300,10 +298,8 @@ asmlinkage void do_IRQ(void)
 
        kstat_this_cpu.irqs[level]++;
 
-       __enter_vx_admin(&vxis);
        for (source = frv_irq_levels[level].sources; source; source = source->next)
                source->doirq(source);
-       __leave_vx_admin(&vxis);
 
        __clr_MASK(level);