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

[linux-2.6.git] / arch / h8300 / platform / h8s / ints.c

diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index f103efa..270440d 100644 (file)
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -23,7 +23,6 @@
 #include <linux/bootmem.h>
 #include <linux/random.h>
 #include <linux/hardirq.h>
-#include <linux/vs_context.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
@@ -262,12 +261,9 @@ void disable_irq(unsigned int irq)
 
 asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
 {
-       struct vx_info_save vxis;
-
        irq_enter();
        /* ISR clear       */
        /* compatible i386 */
-       __enter_vx_admin(&vxis);
        if (vec >= EXT_IRQ0 && vec <= EXT_IRQ15)
                *(volatile unsigned short *)ISR &= ~(1 << (vec - EXT_IRQ0));
        if (vec < NR_IRQS) {
@@ -280,7 +276,6 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
        } else {
                BUG();
        }
-       __leave_vx_admin(&vxis);
        irq_exit();
 }