fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index 6f5272e..d53382c 100644 (file)
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -31,7 +31,6 @@
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <linux/errno.h>
-#include <linux/vs_context.h>
 
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -332,7 +331,6 @@ do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
 {
        struct irqdesc *desc = irq_desc + irq;
-       struct vx_info_save vxis;
 
        /*
         * Some hardware gives randomly wrong interrupts.  Rather
@@ -343,9 +341,7 @@ asmlinkage void asm_do_IRQ(int irq, struct pt_regs *regs)
 
        irq_enter();
        spin_lock(&irq_controller_lock);
-       __enter_vx_admin(&vxis);
        desc->handle(irq, desc, regs);
-       __leave_vx_admin(&vxis);
        spin_unlock(&irq_controller_lock);
        irq_exit();
 }
@@ -549,7 +545,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_
            (irq_flags & IRQF_SHARED && !dev_id))
                return -EINVAL;
 
-       action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);
+       action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
        if (!action)
                return -ENOMEM;